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

diff --git a/2d/3f5b4f31835892d18b2c7cf1990a3cdf3f976d b/2d/3f5b4f31835892d18b2c7cf1990a3cdf3f976d
new file mode 100644 (file)
index 0000000..2f6a0cb
--- /dev/null
+++ b/2d/3f5b4f31835892d18b2c7cf1990a3cdf3f976d
@@ -0,0 +1,135 @@
+Return-Path: <wking@tremily.us>\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 21608431FBD\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Jul 2014 11:38:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       RCVD_IN_DNSWL_NONE=-0.0001] 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 feHdVVizu0P9 for <notmuch@notmuchmail.org>;\r
+       Thu, 17 Jul 2014 11:38:37 -0700 (PDT)\r
+Received: from qmta01.emeryville.ca.mail.comcast.net\r
+       (qmta01.emeryville.ca.mail.comcast.net [76.96.30.16])\r
+       by olra.theworths.org (Postfix) with ESMTP id 315E2431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Jul 2014 11:38:37 -0700 (PDT)\r
+Received: from omta20.emeryville.ca.mail.comcast.net ([76.96.30.87])\r
+       by qmta01.emeryville.ca.mail.comcast.net with comcast\r
+       id TT4P1o0031smiN4A1WecBl; Thu, 17 Jul 2014 18:38:36 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta20.emeryville.ca.mail.comcast.net with comcast\r
+       id TWeb1o005152l3L8gWeb92; Thu, 17 Jul 2014 18:38:35 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+       id EB37E129747D; Thu, 17 Jul 2014 11:38:34 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+       t=1405622314; bh=z/fTYZXt8AqUNgVhTi2eYittykCrVEhgxIA+DHx9ujM=;\r
+       h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+       b=Al2M7fsW0o0Ps/0IUtIUKNmYvpt9R62ooc6i+RvVJaWtu0zP7PJZOBQIQyTBwiur3\r
+       dcDa6OJh/gj5Y+Y8seftzIbfBl4eLy2b/LeDJBnG8BadSBFLYr4bqm4ZufL1JxwX/r\r
+       EhLOitnxEgwmWzC1i3+3IrOhKvLWIOlUKTABLHEw=\r
+Date: Thu, 17 Jul 2014 11:38:34 -0700\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: David Bremner <bremner@debian.org>\r
+Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged\r
+Message-ID: <20140717183834.GT30232@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
+       <87mwc872qw.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="xFAlB6MquX7/xpZD"\r
+Content-Disposition: inline\r
+In-Reply-To: <87mwc872qw.fsf@maritornes.cs.unb.ca>\r
+OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
+       url=http://tremily.us/pubkey.txt\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1405622316;\r
+       bh=JndIYcKnW1AnBih/kTqDvaYXqJgOrw/gL6z5YFqcTgY=;\r
+       h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+       MIME-Version:Content-Type;\r
+       b=gbqZwr+TYjLw5sH8nFAoiqlpk74AJ2Vtyjf2Keu8rPMO4YC5HTa+jAvDxBcP5entr\r
+       xquVKjBNa8VsWCD5M6dYqHkjG2/a7u5vANipfy73d9FW+BjXvzpRhJDfyMeR9fCftH\r
+       H7JP3SmLlRBLv41pyFtVmLn/Of/WDGeDFW9DIXgga+65Z617Q2mk+f2PDnXQ2Cfbx4\r
+       G9Qply3/N7/MTaEluVaT9oKm57eNmock6jUCVCElzINJjRcuDZNfEbQzEv23F8XIch\r
+       S/zcKgV9Q+sRCUX6XH6U3fiBJDkdwD3X5eK1w7NetGgwhvmEHYP5Edj/HumYP/L2tq\r
+       wNqyVNvTlBZ/Q==\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 18:38:45 -0000\r
+\r
+\r
+--xFAlB6MquX7/xpZD\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Thu, Jul 17, 2014 at 06:28:55AM -0300, David Bremner wrote:\r
+> W. Trevor King writes:\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
+> >>=20\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
+>=20\r
+> Perhaps the best thing is to revert that patch then?\r
+\r
+Sure.\r
+\r
+Trevor\r
+\r
+--=20\r
+This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
+For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
+\r
+--xFAlB6MquX7/xpZD\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+Content-Description: OpenPGP digital signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2\r
+\r
+iQIcBAEBAgAGBQJTyBgpAAoJEG8/JgBt8ol8c/UQAMEC4f7FJzsmzbmQmPAc8vo8\r
+nWrFlogxDNMTOHgZBZ7mjsnTtwtLFq6zIT4VVtg6gQzTRWwRCQytBgQngnzmAsGB\r
+2gJrc+kAV4VX90VpX1vmTODeVc7qEi54CYYCIrSfhKkMg+Szk9bILoURxZ2VfaFN\r
+q24qvDl23lc+NjEHmKCQtmK+HJ+P5SS+yyoWTxa2jpctK6vqjvldZHFnP3s0a5U1\r
+JUy/kbq+v3Hcy+TvYRDmc8QfqD1Cp9Y04pNgWRBobg5MQDVHqIjWERQqE7TcJJAR\r
+Vf0PtbqKS1+RhGYJA3lP0so1TbQ0wGq1nFRvEUJCkR2JtfAeNmUd1fVzmZHJ3jmo\r
+b463x6fqZQ6R4IuZKRY3PrLDwwAOGJMpS3QDdvMzXl6VbsKCCJ+cpFZMpJ3RGLKp\r
+SYpvCtqhmueZ0joC+LS0AEVjIM7I9UwAzzxJrr2CI73XMgHVqnsqcSYFUsUq9PeV\r
+UmZv/o6aI4f6ACSVyWDySm6e5ajXdEjpXp4e1jo2IPMQcIjXjEdJWLnBNFSCosBS\r
+yA6JLDymCvqec7xKwT49iea6sk38iPgL026BV/oWSLXNROtGIivdCnl0k2QWu+bE\r
+nwK3VpZAgurQXrrOWI1rJCaOmR6gyiun4mmxXPN1w9oXpirxA4ZZJYL455JIe8Rk\r
+/WybC8hnw5nAIg2t8LCo\r
+=nN5u\r
+-----END PGP SIGNATURE-----\r
+\r
+--xFAlB6MquX7/xpZD--\r