From: W. Trevor King Date: Thu, 17 Jul 2014 18:38:34 +0000 (+1700) Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c7fe04c0b5891318514ea0505ae547e4d8afefb;p=notmuch-archives.git Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged --- diff --git a/2d/3f5b4f31835892d18b2c7cf1990a3cdf3f976d b/2d/3f5b4f31835892d18b2c7cf1990a3cdf3f976d new file mode 100644 index 000000000..2f6a0cbd9 --- /dev/null +++ b/2d/3f5b4f31835892d18b2c7cf1990a3cdf3f976d @@ -0,0 +1,135 @@ +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 21608431FBD + for ; Thu, 17 Jul 2014 11:38:45 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.1 +X-Spam-Level: +X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + RCVD_IN_DNSWL_NONE=-0.0001] 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 feHdVVizu0P9 for ; + Thu, 17 Jul 2014 11:38:37 -0700 (PDT) +Received: from qmta01.emeryville.ca.mail.comcast.net + (qmta01.emeryville.ca.mail.comcast.net [76.96.30.16]) + by olra.theworths.org (Postfix) with ESMTP id 315E2431FB6 + for ; Thu, 17 Jul 2014 11:38:37 -0700 (PDT) +Received: from omta20.emeryville.ca.mail.comcast.net ([76.96.30.87]) + by qmta01.emeryville.ca.mail.comcast.net with comcast + id TT4P1o0031smiN4A1WecBl; Thu, 17 Jul 2014 18:38:36 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta20.emeryville.ca.mail.comcast.net with comcast + id TWeb1o005152l3L8gWeb92; Thu, 17 Jul 2014 18:38:35 +0000 +Received: by odin.tremily.us (Postfix, from userid 1000) + id EB37E129747D; Thu, 17 Jul 2014 11:38:34 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; + t=1405622314; bh=z/fTYZXt8AqUNgVhTi2eYittykCrVEhgxIA+DHx9ujM=; + h=Date:From:To:Cc:Subject:References:In-Reply-To; + b=Al2M7fsW0o0Ps/0IUtIUKNmYvpt9R62ooc6i+RvVJaWtu0zP7PJZOBQIQyTBwiur3 + dcDa6OJh/gj5Y+Y8seftzIbfBl4eLy2b/LeDJBnG8BadSBFLYr4bqm4ZufL1JxwX/r + EhLOitnxEgwmWzC1i3+3IrOhKvLWIOlUKTABLHEw= +Date: Thu, 17 Jul 2014 11:38:34 -0700 +From: "W. Trevor King" +To: David Bremner +Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged +Message-ID: <20140717183834.GT30232@odin> +References: + + <87bnsp7wyt.fsf@maritornes.cs.unb.ca> <20140716230347.GQ30232@odin> + <87mwc872qw.fsf@maritornes.cs.unb.ca> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha1; + protocol="application/pgp-signature"; boundary="xFAlB6MquX7/xpZD" +Content-Disposition: inline +In-Reply-To: <87mwc872qw.fsf@maritornes.cs.unb.ca> +OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8; + url=http://tremily.us/pubkey.txt +User-Agent: Mutt/1.5.23 (2014-03-12) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1405622316; + bh=JndIYcKnW1AnBih/kTqDvaYXqJgOrw/gL6z5YFqcTgY=; + h=Received:Received:Received:Date:From:To:Subject:Message-ID: + MIME-Version:Content-Type; + b=gbqZwr+TYjLw5sH8nFAoiqlpk74AJ2Vtyjf2Keu8rPMO4YC5HTa+jAvDxBcP5entr + xquVKjBNa8VsWCD5M6dYqHkjG2/a7u5vANipfy73d9FW+BjXvzpRhJDfyMeR9fCftH + H7JP3SmLlRBLv41pyFtVmLn/Of/WDGeDFW9DIXgga+65Z617Q2mk+f2PDnXQ2Cfbx4 + G9Qply3/N7/MTaEluVaT9oKm57eNmock6jUCVCElzINJjRcuDZNfEbQzEv23F8XIch + S/zcKgV9Q+sRCUX6XH6U3fiBJDkdwD3X5eK1w7NetGgwhvmEHYP5Edj/HumYP/L2tq + wNqyVNvTlBZ/Q== +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." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 17 Jul 2014 18:38:45 -0000 + + +--xFAlB6MquX7/xpZD +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +On Thu, Jul 17, 2014 at 06:28:55AM -0300, David Bremner wrote: +> W. Trevor King 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: +> >>=20 +> >> 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' +> > +> > if they run 'nmbug status' without an @upstream. +> > +> > I'm working through the Python translation now ;). +>=20 +> Perhaps the best thing is to revert that patch then? + +Sure. + +Trevor + +--=20 +This email may be signed or encrypted with GnuPG (http://www.gnupg.org). +For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy + +--xFAlB6MquX7/xpZD +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: OpenPGP digital signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBAgAGBQJTyBgpAAoJEG8/JgBt8ol8c/UQAMEC4f7FJzsmzbmQmPAc8vo8 +nWrFlogxDNMTOHgZBZ7mjsnTtwtLFq6zIT4VVtg6gQzTRWwRCQytBgQngnzmAsGB +2gJrc+kAV4VX90VpX1vmTODeVc7qEi54CYYCIrSfhKkMg+Szk9bILoURxZ2VfaFN +q24qvDl23lc+NjEHmKCQtmK+HJ+P5SS+yyoWTxa2jpctK6vqjvldZHFnP3s0a5U1 +JUy/kbq+v3Hcy+TvYRDmc8QfqD1Cp9Y04pNgWRBobg5MQDVHqIjWERQqE7TcJJAR +Vf0PtbqKS1+RhGYJA3lP0so1TbQ0wGq1nFRvEUJCkR2JtfAeNmUd1fVzmZHJ3jmo +b463x6fqZQ6R4IuZKRY3PrLDwwAOGJMpS3QDdvMzXl6VbsKCCJ+cpFZMpJ3RGLKp +SYpvCtqhmueZ0joC+LS0AEVjIM7I9UwAzzxJrr2CI73XMgHVqnsqcSYFUsUq9PeV +UmZv/o6aI4f6ACSVyWDySm6e5ajXdEjpXp4e1jo2IPMQcIjXjEdJWLnBNFSCosBS +yA6JLDymCvqec7xKwT49iea6sk38iPgL026BV/oWSLXNROtGIivdCnl0k2QWu+bE +nwK3VpZAgurQXrrOWI1rJCaOmR6gyiun4mmxXPN1w9oXpirxA4ZZJYL455JIe8Rk +/WybC8hnw5nAIg2t8LCo +=nN5u +-----END PGP SIGNATURE----- + +--xFAlB6MquX7/xpZD--