Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

diff --git a/9c/59be73b4625ea3cb86b89d41c4f2b1ed5a9a1e b/9c/59be73b4625ea3cb86b89d41c4f2b1ed5a9a1e
new file mode 100644 (file)
index 0000000..ff2c926
--- /dev/null
+++ b/9c/59be73b4625ea3cb86b89d41c4f2b1ed5a9a1e
@@ -0,0 +1,75 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 34A00431FC2\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Jul 2014 02:29:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id co+iSiB3PyyG for <notmuch@notmuchmail.org>;\r
+       Thu, 17 Jul 2014 02:29:03 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8F5AC431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Jul 2014 02:29:03 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1X7hzm-0002Gn-Jt; Thu, 17 Jul 2014 06:28:58 -0300\r
+Received: (nullmailer pid 21082 invoked by uid 1000); Thu, 17 Jul 2014\r
+       09:28:55 -0000\r
+From: David Bremner <bremner@debian.org>\r
+To: "W. Trevor King" <wking@tremily.us>\r
+Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged\r
+In-Reply-To: <20140716230347.GQ30232@odin>\r
+References: <cover.1404678709.git.wking@tremily.us>\r
+       <f96d39a63a505216141bd2daaf3a52e066713296.1404678709.git.wking@tremily.us>\r
+       <87bnsp7wyt.fsf@maritornes.cs.unb.ca> <20140716230347.GQ30232@odin>\r
+User-Agent: Notmuch/0.18.1+45~gf47eeac (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 17 Jul 2014 06:28:55 -0300\r
+Message-ID: <87mwc872qw.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 17 Jul 2014 09:29:07 -0000\r
+\r
+"W. Trevor King" <wking@tremily.us> writes:\r
+\r
+> On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote:\r
+>> W. Trevor King writes:\r
+>> > If we don't have an upstream, there is nothing to merge, so\r
+>> > nothing is unmerged.  This avoids errors like:\r
+>> \r
+>> pushed this one patch.\r
+>\r
+> Without the stderr-catching of something like patch 3, this means\r
+> folks without an upstream are going to see a distracting:\r
+>\r
+>   error: No upstream configured for branch 'master'\r
+>\r
+> if they run 'nmbug status' without an @upstream.\r
+>\r
+> I'm working through the Python translation now ;).\r
+\r
+Perhaps the best thing is to revert that patch then?\r
+\r
+d\r