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

diff --git a/e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd b/e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd
new file mode 100644 (file)
index 0000000..2a2d2b6
--- /dev/null
+++ b/e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd
@@ -0,0 +1,61 @@
+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 CBAEB431FC4\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jul 2014 15:36:22 -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 JoEKC6XIW+Gy for <notmuch@notmuchmail.org>;\r
+       Wed, 16 Jul 2014 15:36:15 -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 7B9F3431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jul 2014 15:36:15 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1X7Xo6-0008Uw-Gm; Wed, 16 Jul 2014 19:36:14 -0300\r
+Received: (nullmailer pid 29616 invoked by uid 1000); Wed, 16 Jul 2014\r
+       22:36:10 -0000\r
+From: David Bremner <bremner@debian.org>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged\r
+In-Reply-To:\r
+ <f96d39a63a505216141bd2daaf3a52e066713296.1404678709.git.wking@tremily.us>\r
+References: <cover.1404678709.git.wking@tremily.us>\r
+       <f96d39a63a505216141bd2daaf3a52e066713296.1404678709.git.wking@tremily.us>\r
+User-Agent: Notmuch/0.18.1+45~gf47eeac (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 16 Jul 2014 19:36:10 -0300\r
+Message-ID: <87bnsp7wyt.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 22:36:23 -0000\r
+\r
+"W. Trevor King" <wking@tremily.us> writes:\r
+\r
+> If we don't have an upstream, there is nothing to merge, so nothing is\r
+> unmerged.  This avoids errors like:\r
+\r
+pushed this one patch.\r
+\r
+d\r