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

diff --git a/6b/b8878b0756fc442202a5a6433927fea1392cdc b/6b/b8878b0756fc442202a5a6433927fea1392cdc
new file mode 100644 (file)
index 0000000..528e8ee
--- /dev/null
+++ b/6b/b8878b0756fc442202a5a6433927fea1392cdc
@@ -0,0 +1,129 @@
+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 12E8B431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jul 2014 16:03:54 -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 91mOzlF+QmOz for <notmuch@notmuchmail.org>;\r
+       Wed, 16 Jul 2014 16:03:50 -0700 (PDT)\r
+Received: from qmta06.westchester.pa.mail.comcast.net\r
+       (qmta06.westchester.pa.mail.comcast.net [76.96.62.56])\r
+       by olra.theworths.org (Postfix) with ESMTP id 11C06431FBD\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jul 2014 16:03:49 -0700 (PDT)\r
+Received: from omta07.westchester.pa.mail.comcast.net ([76.96.62.59])\r
+       by qmta06.westchester.pa.mail.comcast.net with comcast\r
+       id TAg51o0041GhbT856B3p01; Wed, 16 Jul 2014 23:03:49 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta07.westchester.pa.mail.comcast.net with comcast\r
+       id TB3o1o004152l3L3TB3o9w; Wed, 16 Jul 2014 23:03:49 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+       id 9E0CE129669B; Wed, 16 Jul 2014 16:03:47 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+       t=1405551827; bh=uHFC7qQT1F+WCvmI836Uz/sB6zLkiYOyw85Ac4EvPJ8=;\r
+       h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+       b=NxvUFtblX+DRXOZdebAYEzsOk1voKnB7VJw7WvErDgiLmd117m8VaIozIhGH+MQnF\r
+       5KSisA79a/OEZDiHFwvtJxNtKWWmbWQ1qFx9SfWZBSPIUFE7CAmdD/CpxJ0wM82+N1\r
+       jMJjoIZ2MwgV1xA9w2q414JQptt9CMuDJy1xwEWg=\r
+Date: Wed, 16 Jul 2014 16:03:47 -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: <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>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="yFH6hwN92mUA4HK5"\r
+Content-Disposition: inline\r
+In-Reply-To: <87bnsp7wyt.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=1405551829;\r
+       bh=UtlaSQODafTug/mn4Y6Wc8P1t1WTjxvUEaFkXxKgDE0=;\r
+       h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+       MIME-Version:Content-Type;\r
+       b=goRIPhauEnfI/CDstdQD8tawm/UltENE8W8kHzysBwpsoemk4Wp5A8TYbwviZcm1A\r
+       Q4M+1TpMa2zKwRMqrf4Ok2Skcf9DeTZq3nReDMgtUGfExicv+rYJfeRGEM1FQVadVm\r
+       U01UohvNKweSAENMPlFN7EHJhyD+zEMFCgglW4TpeUILEnQhKLKCzgLLEME4POPQEm\r
+       68y0JghHWeYlctwRJbwvC4+wN83UwxW1qEusjzni3UsxTWd0RgAufmHhPhWMxCBBFX\r
+       YbA7Z95J1hQ7Dw32egqbNguPvz8Y+wHsmK/K/rIBf0FR2L+bmSiaqTkFcGcfVGdRec\r
+       OIh+U4gYAZv/w==\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: Wed, 16 Jul 2014 23:03:54 -0000\r
+\r
+\r
+--yFH6hwN92mUA4HK5\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\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
+>=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
+\r
+Cheers,\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
+--yFH6hwN92mUA4HK5\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
+iQIcBAEBAgAGBQJTxwTRAAoJEG8/JgBt8ol8vZkQAJbhkFI4rbWbKPSogB8rViEZ\r
+WiBsUDuBJQqwNc54NjI73hb0Hb0tfOPXbwcnYOAjBe2F++yIP72T6TVGAv9dvXbP\r
+5E0ZQ3ClViNWbberwLl0uu4PMa/nHSTcN4NjfC69/8mQpKSekjlMEA+DlF0VAFmh\r
+Lqc2xEsD5dyZmTdGRj9x4dPSvPgCcs4+sEEJJHrRI1ilXOmqKaZe0yEIq/cE9VDc\r
+nx+ifIxFR6+0FONCmggmOPI93eBkZevBxem35AaofnlL5TdKUT2e0o6T6C+g2gko\r
+E2P9FUDahxAyhYlEEvJWjE9x0XlAP1odY9lL5KhoI4g80k34gXobXKRCQ2TceLXK\r
+JXJa8y3MLK0seXMlAWQVYLcilRPPRg+FgDCMXIBUS2W5EjQUU+vBFowRGm570Rts\r
+cKqHYKHWL6QgUiX/T+9i/3puQEx++RHDMB312pv2NXnD4n9YTRevAcl37V3Hnaz3\r
+/YAwrI2ytMuavh0TyQ/OZe68obi+Mn+s3giM/RAvEW7KYaIIow/ZKpWucQ/GnKLZ\r
+ZE6Slcd3HZfsDMVEKDX9yRhCdnysa4SqJE0saoh0Q7GYCMczeybYjFpheeY1Qqwz\r
+XqR9QSI+m7/NVX9ti+fIELp/UfKt7qa8FaI/628dx5V4vxOO7IIUAlX9eLCOZfLe\r
+eSdts5vjYnidfxxzKK53\r
+=L7nC\r
+-----END PGP SIGNATURE-----\r
+\r
+--yFH6hwN92mUA4HK5--\r