Re: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading configs

diff --git a/1f/f1db1c83aab6ef9d63e365e99bb76659bac504 b/1f/f1db1c83aab6ef9d63e365e99bb76659bac504
new file mode 100644 (file)
index 0000000..4ab1236
--- /dev/null
+++ b/1f/f1db1c83aab6ef9d63e365e99bb76659bac504
@@ -0,0 +1,77 @@
+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 EBAE9431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Jul 2014 05:31:08 -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 dA0GqIYYoTeh for <notmuch@notmuchmail.org>;\r
+       Sun, 13 Jul 2014 05:31:01 -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 12D47431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Jul 2014 05:31:01 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1X6Ivk-0006rl-G7; Sun, 13 Jul 2014 09:31:00 -0300\r
+Received: (nullmailer pid 18458 invoked by uid 1000); Sun, 13 Jul 2014\r
+       12:30:56 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading\r
+       configs\r
+In-Reply-To:\r
+ <7ddcf7368895768aa0a2d37dac0d4f96e9666f16.1399749244.git.wking@tremily.us>\r
+References: <cover.1399749244.git.wking@tremily.us>\r
+       <7ddcf7368895768aa0a2d37dac0d4f96e9666f16.1399749244.git.wking@tremily.us>\r
+User-Agent: Notmuch/0.18.1+29~gb5327d4 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 13 Jul 2014 09:30:56 -0300\r
+Message-ID: <87tx6lfnjz.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 13 Jul 2014 12:31:09 -0000\r
+\r
+"W. Trevor King" <wking@tremily.us> writes:\r
+\r
+> When loading configs from Git, the bare branch name (without a\r
+> refs/heads/ prefix or similar) matches all branches of that name\r
+> (including remote-tracking branches):\r
+>\r
+>   .nmbug $ git show-ref config\r
+>   48f3bbf1d1492e5f3d2f01de6ea79a30d3840f20 refs/heads/config\r
+>   48f3bbf1d1492e5f3d2f01de6ea79a30d3840f20 refs/remotes/origin/config\r
+>   4b6dbd9ffd152e7476f5101eff26747f34497cee refs/remotes/wking/config\r
+>\r
+> Instead of relying on the ordering of the matching references, use\r
+> --heads to ensure we only match local branches.\r
+\r
+ah. I should have read both patches before replying. \r
+\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 this\r
+ambiguity is not as nice, but I'd rather it was only the minority of\r
+users with unusual setups (e.g. multiple remotes) have to do\r
+configuration.\r
+\r
+d\r