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