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 6B6CB431FBD
	for <notmuch@notmuchmail.org>; Sat, 19 Jul 2014 05:34:46 -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 6fRu+FrtuUms for <notmuch@notmuchmail.org>;
	Sat, 19 Jul 2014 05:34:36 -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 B4E69431FB6
	for <notmuch@notmuchmail.org>; Sat, 19 Jul 2014 05:34:36 -0700 (PDT)
Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
	(envelope-from <david@tethera.net>)
	id 1X8TqV-00063M-Ai; Sat, 19 Jul 2014 09:34:35 -0300
Received: (nullmailer pid 18578 invoked by uid 1000); Sat, 19 Jul 2014
	12:34:31 -0000
From: David Bremner <bremner@debian.org>
To: "W. Trevor King" <wking@tremily.us>
Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged
In-Reply-To: <20140716230347.GQ30232@odin>
References: <cover.1404678709.git.wking@tremily.us>
	<f96d39a63a505216141bd2daaf3a52e066713296.1404678709.git.wking@tremily.us>
	<87bnsp7wyt.fsf@maritornes.cs.unb.ca> <20140716230347.GQ30232@odin>
User-Agent: Notmuch/0.18.1+45~gf47eeac (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-pc-linux-gnu)
Date: Sat, 19 Jul 2014 09:34:31 -0300
Message-ID: <87pph15xyg.fsf@maritornes.cs.unb.ca>
MIME-Version: 1.0
Content-Type: text/plain
Cc: notmuch@notmuchmail.org
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: Sat, 19 Jul 2014 12:34:46 -0000

"W. Trevor King" <wking@tremily.us> writes:

> On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote:
>> 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.
>
> Without the stderr-catching of something like patch 3, this means
> folks without an upstream are going to see a distracting:
>
>   error: No upstream configured for branch 'master'
>

On reflection, I don't think that patch made things worse for this use
case. So I don't think it really hurts to leave it there for now.

d