From 4ce7c49eb4d2b6f503cc305d975bfd79cb755639 Mon Sep 17 00:00:00 2001
From: David Bremner <bremner@debian.org>
Date: Wed, 16 Jul 2014 20:44:53 +2100
Subject: [PATCH] Re: [PATCH 2/4] nmbug: Handle missing @upstream in
 is_unmerged

---
 e4/c78843c5c416c4e83c08ba627e443e787d3fca | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 e4/c78843c5c416c4e83c08ba627e443e787d3fca

diff --git a/e4/c78843c5c416c4e83c08ba627e443e787d3fca b/e4/c78843c5c416c4e83c08ba627e443e787d3fca
new file mode 100644
index 000000000..4131b4f04
--- /dev/null
+++ b/e4/c78843c5c416c4e83c08ba627e443e787d3fca
@@ -0,0 +1,66 @@
+Return-Path: <david@tethera.net>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 35B67431FC4
+	for <notmuch@notmuchmail.org>; Tue, 15 Jul 2014 16:45:01 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id daztKjc2v+7M for <notmuch@notmuchmail.org>;
+	Tue, 15 Jul 2014 16:44:57 -0700 (PDT)
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
+	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id A2AE6431FC0
+	for <notmuch@notmuchmail.org>; Tue, 15 Jul 2014 16:44:57 -0700 (PDT)
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
+	(envelope-from <david@tethera.net>)
+	id 1X7CP2-0003LQ-Tl; Tue, 15 Jul 2014 20:44:56 -0300
+Received: (nullmailer pid 5239 invoked by uid 1000); Tue, 15 Jul 2014
+	23:44:53 -0000
+From: David Bremner <bremner@debian.org>
+To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org
+Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged
+In-Reply-To:
+ <f96d39a63a505216141bd2daaf3a52e066713296.1404678709.git.wking@tremily.us>
+References: <cover.1404678709.git.wking@tremily.us>
+	<f96d39a63a505216141bd2daaf3a52e066713296.1404678709.git.wking@tremily.us>
+User-Agent: Notmuch/0.18.1+45~gf47eeac (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-pc-linux-gnu)
+Date: Tue, 15 Jul 2014 20:44:53 -0300
+Message-ID: <874myi89vu.fsf@maritornes.cs.unb.ca>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Tue, 15 Jul 2014 23:45:01 -0000
+
+"W. Trevor King" <wking@tremily.us> writes:
+
+> -  my $fetch_head = git ('rev-parse', $commit);
+> +  my ($fetch_head, $status) = git_with_status ('rev-parse', $commit);
+> +  if ($status) {
+> +    return 0;
+> +  }
+
+Could there be other errors here, other than @{upstream} not existing?
+At first glance it seems like there is potential to hide errors here.
+
+d
+
-- 
2.26.2