From d798e98ec04a4123f3fab477f24b21bb84da8dba Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 17 Jul 2014 16:03:47 +1700 Subject: [PATCH] Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged --- 6b/b8878b0756fc442202a5a6433927fea1392cdc | 129 ++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 6b/b8878b0756fc442202a5a6433927fea1392cdc diff --git a/6b/b8878b0756fc442202a5a6433927fea1392cdc b/6b/b8878b0756fc442202a5a6433927fea1392cdc new file mode 100644 index 000000000..528e8ee44 --- /dev/null +++ b/6b/b8878b0756fc442202a5a6433927fea1392cdc @@ -0,0 +1,129 @@ +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 12E8B431FC0 + for ; Wed, 16 Jul 2014 16:03:54 -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 91mOzlF+QmOz for ; + Wed, 16 Jul 2014 16:03:50 -0700 (PDT) +Received: from qmta06.westchester.pa.mail.comcast.net + (qmta06.westchester.pa.mail.comcast.net [76.96.62.56]) + by olra.theworths.org (Postfix) with ESMTP id 11C06431FBD + for ; Wed, 16 Jul 2014 16:03:49 -0700 (PDT) +Received: from omta07.westchester.pa.mail.comcast.net ([76.96.62.59]) + by qmta06.westchester.pa.mail.comcast.net with comcast + id TAg51o0041GhbT856B3p01; Wed, 16 Jul 2014 23:03:49 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta07.westchester.pa.mail.comcast.net with comcast + id TB3o1o004152l3L3TB3o9w; Wed, 16 Jul 2014 23:03:49 +0000 +Received: by odin.tremily.us (Postfix, from userid 1000) + id 9E0CE129669B; Wed, 16 Jul 2014 16:03:47 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; + t=1405551827; bh=uHFC7qQT1F+WCvmI836Uz/sB6zLkiYOyw85Ac4EvPJ8=; + h=Date:From:To:Cc:Subject:References:In-Reply-To; + b=NxvUFtblX+DRXOZdebAYEzsOk1voKnB7VJw7WvErDgiLmd117m8VaIozIhGH+MQnF + 5KSisA79a/OEZDiHFwvtJxNtKWWmbWQ1qFx9SfWZBSPIUFE7CAmdD/CpxJ0wM82+N1 + jMJjoIZ2MwgV1xA9w2q414JQptt9CMuDJy1xwEWg= +Date: Wed, 16 Jul 2014 16:03:47 -0700 +From: "W. Trevor King" +To: David Bremner +Subject: Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged +Message-ID: <20140716230347.GQ30232@odin> +References: + + <87bnsp7wyt.fsf@maritornes.cs.unb.ca> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha1; + protocol="application/pgp-signature"; boundary="yFH6hwN92mUA4HK5" +Content-Disposition: inline +In-Reply-To: <87bnsp7wyt.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=1405551829; + bh=UtlaSQODafTug/mn4Y6Wc8P1t1WTjxvUEaFkXxKgDE0=; + h=Received:Received:Received:Date:From:To:Subject:Message-ID: + MIME-Version:Content-Type; + b=goRIPhauEnfI/CDstdQD8tawm/UltENE8W8kHzysBwpsoemk4Wp5A8TYbwviZcm1A + Q4M+1TpMa2zKwRMqrf4Ok2Skcf9DeTZq3nReDMgtUGfExicv+rYJfeRGEM1FQVadVm + U01UohvNKweSAENMPlFN7EHJhyD+zEMFCgglW4TpeUILEnQhKLKCzgLLEME4POPQEm + 68y0JghHWeYlctwRJbwvC4+wN83UwxW1qEusjzni3UsxTWd0RgAufmHhPhWMxCBBFX + YbA7Z95J1hQ7Dw32egqbNguPvz8Y+wHsmK/K/rIBf0FR2L+bmSiaqTkFcGcfVGdRec + OIh+U4gYAZv/w== +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: Wed, 16 Jul 2014 23:03:54 -0000 + + +--yFH6hwN92mUA4HK5 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +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 ;). + +Cheers, +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 + +--yFH6hwN92mUA4HK5 +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: OpenPGP digital signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBAgAGBQJTxwTRAAoJEG8/JgBt8ol8vZkQAJbhkFI4rbWbKPSogB8rViEZ +WiBsUDuBJQqwNc54NjI73hb0Hb0tfOPXbwcnYOAjBe2F++yIP72T6TVGAv9dvXbP +5E0ZQ3ClViNWbberwLl0uu4PMa/nHSTcN4NjfC69/8mQpKSekjlMEA+DlF0VAFmh +Lqc2xEsD5dyZmTdGRj9x4dPSvPgCcs4+sEEJJHrRI1ilXOmqKaZe0yEIq/cE9VDc +nx+ifIxFR6+0FONCmggmOPI93eBkZevBxem35AaofnlL5TdKUT2e0o6T6C+g2gko +E2P9FUDahxAyhYlEEvJWjE9x0XlAP1odY9lL5KhoI4g80k34gXobXKRCQ2TceLXK +JXJa8y3MLK0seXMlAWQVYLcilRPPRg+FgDCMXIBUS2W5EjQUU+vBFowRGm570Rts +cKqHYKHWL6QgUiX/T+9i/3puQEx++RHDMB312pv2NXnD4n9YTRevAcl37V3Hnaz3 +/YAwrI2ytMuavh0TyQ/OZe68obi+Mn+s3giM/RAvEW7KYaIIow/ZKpWucQ/GnKLZ +ZE6Slcd3HZfsDMVEKDX9yRhCdnysa4SqJE0saoh0Q7GYCMczeybYjFpheeY1Qqwz +XqR9QSI+m7/NVX9ti+fIELp/UfKt7qa8FaI/628dx5V4vxOO7IIUAlX9eLCOZfLe +eSdts5vjYnidfxxzKK53 +=L7nC +-----END PGP SIGNATURE----- + +--yFH6hwN92mUA4HK5-- -- 2.26.2