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 (file)
index 0000000..826c834
--- /dev/null
+++ b/f6/9587a8fdb8cc6909a54bd0f909955ccbccc188
@@ -0,0 +1,81 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 14D5C431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 14 Jul 2014 02:51:53 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 9vIaO1bX74X9 for <notmuch@notmuchmail.org>;\r
+       Mon, 14 Jul 2014 02:51:45 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 3EE6A431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 14 Jul 2014 02:51:30 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1X6cus-0002hF-4e; Mon, 14 Jul 2014 06:51:26 -0300\r
+Received: (nullmailer pid 25226 invoked by uid 1000); Mon, 14 Jul 2014\r
+       09:51:22 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: "W. Trevor King" <wking@tremily.us>\r
+Subject: Re: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading\r
+       configs\r
+In-Reply-To: <20140713181339.GB23983@odin.tremily.us>\r
+References: <cover.1399749244.git.wking@tremily.us>\r
+       <7ddcf7368895768aa0a2d37dac0d4f96e9666f16.1399749244.git.wking@tremily.us>\r
+       <87tx6lfnjz.fsf@maritornes.cs.unb.ca>\r
+       <20140713181339.GB23983@odin.tremily.us>\r
+User-Agent: Notmuch/0.18.1+37~gde262a2 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 14 Jul 2014 06:51:22 -0300\r
+Message-ID: <87pph8b751.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 14 Jul 2014 09:51:53 -0000\r
+\r
+"W. Trevor King" <wking@tremily.us> writes:\r
+\r
+> On Sun, Jul 13, 2014 at 09:30:56AM -0300, David Bremner wrote:\r
+>> I consider it a useful feature that it works without the user\r
+>> configuring a local branch.  I agree that in more complex setups\r
+>> this ambiguity is not as nice, but I'd rather it was only the\r
+>> minority of users with unusual setups (e.g. multiple remotes) have\r
+>> to do configuration.\r
+>\r
+> I could work up a patch that tried =E2=80=98git show-ref -s config=E2=80=\r
+=99 first, and\r
+> only fell back to =E2=80=98show-ref -s --heads=E2=80=99 if there were mul=\r
+tiple\r
+> matches.  That way folks with only origin/config wouldn't need a local\r
+> branch, but folks with multiple config-carrying remotes (or a single\r
+> config-carrying remote and a local branch) would have to have a local\r
+> config to break the tie.  That's possible, and not *too* complicated,\r
+> but I personally prefer the consistency of just requiring a local\r
+> config branch.\r
+\r
+It might be simpler to implement (and understand) to try first the local\r
+config branch and then fall back to "origin/config".\r
+\r
+d\r