1 Return-Path: <wking@tremily.us>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 16962431FD6
\r
6 for <notmuch@notmuchmail.org>; Sat, 10 May 2014 12:17:33 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=0 tagged_above=-999 required=5
\r
13 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id s1AEZXYEJp+J for <notmuch@notmuchmail.org>;
\r
18 Sat, 10 May 2014 12:17:27 -0700 (PDT)
\r
19 Received: from qmta10.westchester.pa.mail.comcast.net
\r
20 (qmta10.westchester.pa.mail.comcast.net [76.96.62.17])
\r
21 by olra.theworths.org (Postfix) with ESMTP id 4567F431FC2
\r
22 for <notmuch@notmuchmail.org>; Sat, 10 May 2014 12:17:24 -0700 (PDT)
\r
23 Received: from omta06.westchester.pa.mail.comcast.net ([76.96.62.51])
\r
24 by qmta10.westchester.pa.mail.comcast.net with comcast
\r
25 id 0K4p1o00116LCl05AKHL3r; Sat, 10 May 2014 19:17:20 +0000
\r
26 Received: from odin.tremily.us ([24.18.63.50])
\r
27 by omta06.westchester.pa.mail.comcast.net with comcast
\r
28 id 0KHG1o00P152l3L3SKHHd1; Sat, 10 May 2014 19:17:18 +0000
\r
29 Received: from mjolnir.tremily.us (unknown [192.168.0.140])
\r
30 by odin.tremily.us (Postfix) with ESMTPS id 58AB4119F4AF;
\r
31 Sat, 10 May 2014 12:17:16 -0700 (PDT)
\r
32 Received: (nullmailer pid 7966 invoked by uid 1000);
\r
33 Sat, 10 May 2014 19:16:43 -0000
\r
34 From: "W. Trevor King" <wking@tremily.us>
\r
35 To: notmuch@notmuchmail.org
\r
36 Subject: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading configs
\r
37 Date: Sat, 10 May 2014 12:16:39 -0700
\r
39 <7ddcf7368895768aa0a2d37dac0d4f96e9666f16.1399749244.git.wking@tremily.us>
\r
40 X-Mailer: git-send-email 1.9.1.353.gc66d89d
\r
41 In-Reply-To: <cover.1399749244.git.wking@tremily.us>
\r
42 References: <cover.1399749244.git.wking@tremily.us>
\r
43 In-Reply-To: <cover.1399749244.git.wking@tremily.us>
\r
44 References: <cover.1399749244.git.wking@tremily.us>
\r
45 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
46 s=q20140121; t=1399749440;
\r
47 bh=iZQIHHMOntfhaLmAKrWxUN0aMVer0CrkzfYK3f5SqM4=;
\r
48 h=Received:Received:Received:Received:From:To:Subject:Date:
\r
50 b=GWfs3fZfhfWTdbBSqjd0cErZsXo4HIW9M3lGwJehe6SWcuMadv3qhcGA//CdPFB0P
\r
51 F1DjbpcfIGK9mtwIoD15xOJowFuKlCTfkZT/idoFrLbYJhaj6uv4zhTv8S1sB/WbRC
\r
52 YyyTVuE1iDTGg/cCI9AsCvLoSjXPjbJaT4VWSA5YO3G/N19gjg5loVr3Q+AjOTHR+t
\r
53 /4k45p9yGI7xg6/oQ+exscg+PAhndfeV2B+Av8URhPE6Ghc3qOHIim53QtLst2QGT9
\r
54 Ew09rEojf/S7QCJhB2Oklk07IuJqlYLaeVVu5bmbfIipv+DqHurVLNjEgV20y0ApXt
\r
56 X-BeenThere: notmuch@notmuchmail.org
\r
57 X-Mailman-Version: 2.1.13
\r
59 List-Id: "Use and development of the notmuch mail system."
\r
60 <notmuch.notmuchmail.org>
\r
61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
64 List-Post: <mailto:notmuch@notmuchmail.org>
\r
65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
68 X-List-Received-Date: Sat, 10 May 2014 19:17:33 -0000
\r
70 When loading configs from Git, the bare branch name (without a
\r
71 refs/heads/ prefix or similar) matches all branches of that name
\r
72 (including remote-tracking branches):
\r
74 .nmbug $ git show-ref config
\r
75 48f3bbf1d1492e5f3d2f01de6ea79a30d3840f20 refs/heads/config
\r
76 48f3bbf1d1492e5f3d2f01de6ea79a30d3840f20 refs/remotes/origin/config
\r
77 4b6dbd9ffd152e7476f5101eff26747f34497cee refs/remotes/wking/config
\r
79 Instead of relying on the ordering of the matching references, use
\r
80 --heads to ensure we only match local branches.
\r
82 NEWS | 18 ++++++++++++++++++
\r
83 devel/nmbug/nmbug | 1 +
\r
84 devel/nmbug/nmbug-status | 2 +-
\r
85 3 files changed, 20 insertions(+), 1 deletion(-)
\r
87 diff --git a/NEWS b/NEWS
\r
88 index bcd311d..5f7d30a 100644
\r
92 +Notmuch 0.19 (UNRELEASED)
\r
93 +=========================
\r
98 +`nmbug-status` now only matches local branches when reading
\r
99 +`status-config.json` from the `config` branch of the `NMBGIT`
\r
100 +repository. To help new users running `nmbug-status`, `nmbug clone`
\r
101 +now creates a local `config` branch tracking `origin/config`. Folks
\r
102 +who use `nmbug-status` with an in-Git config (i.e. you don't use the
\r
103 +`--config` option) who already have `NMBGIT` set up are encouraged to
\r
106 + git checkout config origin/config
\r
108 +in their `NMBGIT` repository (usually `~/.nmbug`).
\r
110 Notmuch 0.18~rc0 (2014-04-22)
\r
111 =============================
\r
113 diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
\r
114 index b18ded7..c6793a5 100755
\r
115 --- a/devel/nmbug/nmbug
\r
116 +++ b/devel/nmbug/nmbug
\r
117 @@ -135,6 +135,7 @@ sub do_clone {
\r
118 or die "'git clone' exited with nonzero value\n";
\r
119 git ('config', '--unset', 'core.worktree');
\r
120 git ('config', 'core.bare', 'true');
\r
121 + git ('branch', 'config', 'origin/config');
\r
125 diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
\r
126 index 75a6e47..610c281 100755
\r
127 --- a/devel/nmbug/nmbug-status
\r
128 +++ b/devel/nmbug/nmbug-status
\r
129 @@ -72,7 +72,7 @@ def read_config(path=None, encoding=None):
\r
131 # read only the first line from the pipe
\r
132 sha1_bytes = subprocess.Popen(
\r
133 - ['git', '--git-dir', nmbhome, 'show-ref', '-s', branch],
\r
134 + ['git', '--git-dir', nmbhome, 'show-ref', '-s', '--heads', branch],
\r
135 stdout=subprocess.PIPE).stdout.readline()
\r
136 sha1 = sha1_bytes.decode(encoding).rstrip()
\r