From 98340d731963c3d77cc878ac687dcd38cb7dacd7 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 17 Jul 2014 19:36:10 +2100 Subject: [PATCH] Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged --- e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd | 61 +++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd diff --git a/e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd b/e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd new file mode 100644 index 000000000..2a2d2b6af --- /dev/null +++ b/e8/a4af89b5ffaac57c2fe91fc481c67a30a486dd @@ -0,0 +1,61 @@ +Return-Path: +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 CBAEB431FC4 + for ; Wed, 16 Jul 2014 15:36:22 -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 JoEKC6XIW+Gy for ; + Wed, 16 Jul 2014 15:36:15 -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 7B9F3431FC2 + for ; Wed, 16 Jul 2014 15:36:15 -0700 (PDT) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1X7Xo6-0008Uw-Gm; Wed, 16 Jul 2014 19:36:14 -0300 +Received: (nullmailer pid 29616 invoked by uid 1000); Wed, 16 Jul 2014 + 22:36:10 -0000 +From: David Bremner +To: "W. Trevor King" , notmuch@notmuchmail.org +Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged +In-Reply-To: + +References: + +User-Agent: Notmuch/0.18.1+45~gf47eeac (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-pc-linux-gnu) +Date: Wed, 16 Jul 2014 19:36:10 -0300 +Message-ID: <87bnsp7wyt.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." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 16 Jul 2014 22:36:23 -0000 + +"W. Trevor King" writes: + +> If we don't have an upstream, there is nothing to merge, so nothing is +> unmerged. This avoids errors like: + +pushed this one patch. + +d -- 2.26.2