From: David Bremner Date: Mon, 14 Jul 2014 09:51:22 +0000 (+2100) Subject: Re: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading configs X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8bf93bcaaf2e4a8b9bd60139eb304043edfea87b;p=notmuch-archives.git Re: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading configs --- diff --git a/f6/9587a8fdb8cc6909a54bd0f909955ccbccc188 b/f6/9587a8fdb8cc6909a54bd0f909955ccbccc188 new file mode 100644 index 000000000..826c834ed --- /dev/null +++ b/f6/9587a8fdb8cc6909a54bd0f909955ccbccc188 @@ -0,0 +1,81 @@ +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 14D5C431FBD + for ; Mon, 14 Jul 2014 02:51:53 -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 9vIaO1bX74X9 for ; + Mon, 14 Jul 2014 02:51:45 -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 3EE6A431FBC + for ; Mon, 14 Jul 2014 02:51:30 -0700 (PDT) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1X6cus-0002hF-4e; Mon, 14 Jul 2014 06:51:26 -0300 +Received: (nullmailer pid 25226 invoked by uid 1000); Mon, 14 Jul 2014 + 09:51:22 -0000 +From: David Bremner +To: "W. Trevor King" +Subject: Re: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading + configs +In-Reply-To: <20140713181339.GB23983@odin.tremily.us> +References: + <7ddcf7368895768aa0a2d37dac0d4f96e9666f16.1399749244.git.wking@tremily.us> + <87tx6lfnjz.fsf@maritornes.cs.unb.ca> + <20140713181339.GB23983@odin.tremily.us> +User-Agent: Notmuch/0.18.1+37~gde262a2 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-pc-linux-gnu) +Date: Mon, 14 Jul 2014 06:51:22 -0300 +Message-ID: <87pph8b751.fsf@maritornes.cs.unb.ca> +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable +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: Mon, 14 Jul 2014 09:51:53 -0000 + +"W. Trevor King" writes: + +> On Sun, Jul 13, 2014 at 09:30:56AM -0300, David Bremner wrote: +>> I consider it a useful feature that it works without the user +>> configuring a local branch. I agree that in more complex setups +>> this ambiguity is not as nice, but I'd rather it was only the +>> minority of users with unusual setups (e.g. multiple remotes) have +>> to do configuration. +> +> I could work up a patch that tried =E2=80=98git show-ref -s config=E2=80= +=99 first, and +> only fell back to =E2=80=98show-ref -s --heads=E2=80=99 if there were mul= +tiple +> matches. That way folks with only origin/config wouldn't need a local +> branch, but folks with multiple config-carrying remotes (or a single +> config-carrying remote and a local branch) would have to have a local +> config to break the tie. That's possible, and not *too* complicated, +> but I personally prefer the consistency of just requiring a local +> config branch. + +It might be simpler to implement (and understand) to try first the local +config branch and then fall back to "origin/config". + +d