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 3256D431FB6
\r
6 for <notmuch@notmuchmail.org>; Sun, 22 Mar 2015 01:31:20 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=2.338 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id ysvOG8kDn30r for <notmuch@notmuchmail.org>;
\r
17 Sun, 22 Mar 2015 01:31:16 -0700 (PDT)
\r
18 Received: from resqmta-po-04v.sys.comcast.net (resqmta-po-04v.sys.comcast.net
\r
20 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 71129431FAE
\r
23 for <notmuch@notmuchmail.org>; Sun, 22 Mar 2015 01:31:16 -0700 (PDT)
\r
24 Received: from resomta-po-03v.sys.comcast.net ([96.114.154.227])
\r
25 by resqmta-po-04v.sys.comcast.net with comcast
\r
26 id 6YXE1q0024ueUHc01YXEFa; Sun, 22 Mar 2015 08:31:14 +0000
\r
27 Received: from odin.tremily.us ([67.168.81.176])
\r
28 by resomta-po-03v.sys.comcast.net with comcast
\r
29 id 6YXB1q0063oF5yT01YXBSW; Sun, 22 Mar 2015 08:31:14 +0000
\r
30 Received: by odin.tremily.us (Postfix, from userid 1000)
\r
31 id 5757D16D6865; Sun, 22 Mar 2015 01:31:11 -0700 (PDT)
\r
32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;
\r
33 t=1427013071; bh=tN83NNTXxLXHw2/7mI1rE6sQqRpKYQeynaM7Rmm7NAE=;
\r
34 h=From:To:Cc:Subject:Date;
\r
35 b=p3dxUBu+d1OjpKSuMqcEXWQTmKYLndUU0p6n8AoFxPZMa1P1cvBMaDr5ake3n4G+L
\r
36 jYL2UiFO5oXtmrS4x/iGbDM7OrCpFjrTK4dZJ771773jHZAQ+3+4clyh6Z59vvjydU
\r
37 MqauV//9g3mEZ4TUl7qaTlMuthirlur3rIKO95N0=
\r
38 From: "W. Trevor King" <wking@tremily.us>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH v3] nmbug-status: Use 'show-ref --heads' for loading configs
\r
41 Date: Sun, 22 Mar 2015 01:31:09 -0700
\r
43 <e9d25cc269b7bcc058627466adfa2835256b6e76.1427012574.git.wking@tremily.us>
\r
44 X-Mailer: git-send-email 2.0.5
\r
45 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
46 s=q20140121; t=1427013074;
\r
47 bh=5HQHI2D1woA/MJ8y1NlfwCdxKIQPvLjsash4t7OluZM=;
\r
48 h=Received:Received:Received:From:To:Subject:Date:Message-Id;
\r
49 b=WVc0wdqq0J3aNM99zz2DSh9olSj35IVAt5zRaUq/n1GaQf1W5DsC2DNyAXUCuoEOi
\r
50 sMyeqHWd4hflf/8Vh+Q9jkUxN7gtEiqsdSamhfDGgWuAt0hvQMj0U6xr//5rVyQ68l
\r
51 As4hHdc2kI/XgpMhMd2V+cy5lH/ckvtHOSM7ST8yfh/l1ZEvMIsiiiGB3pZ/8QuJgS
\r
52 lFQTvQ6+T1bCB53FaPUhdp1LsOiSM8VczVY5WO16L/jCf9vFtpUOecuYRpClYwkvBH
\r
53 S5Un5VwltOXM2WwmiKxEkW0PpmEoQx/Xb60D6WqFlUWkYdDsPftQVUMY5P8fQ618Ph
\r
55 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\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: Sun, 22 Mar 2015 08:31:20 -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 The only change since v2 [1] is shifting the NEWS entry into the
\r
83 unreleased 0.20 section [2].
\r
85 [1]: id:5e97afaab6c01e980ca6194a1c04aa0310e28ab8.1426412504.git.wking@tremily.us
\r
86 http://thread.gmane.org/gmane.mail.notmuch.general/20344/
\r
87 [2]: id:m2bnjm7o16.fsf@guru.guru-group.fi
\r
88 http://article.gmane.org/gmane.mail.notmuch.general/20350
\r
91 NEWS | 31 +++++++++++++++++++++++--------
\r
92 devel/nmbug/nmbug | 1 +
\r
93 devel/nmbug/nmbug-status | 2 +-
\r
94 3 files changed, 25 insertions(+), 9 deletions(-)
\r
96 diff --git a/NEWS b/NEWS
\r
97 index 70ad3f3..de13bbd 100644
\r
100 @@ -23,6 +23,21 @@ Contrib
\r
101 previously provided by `notmuch-deliver` should now be provided by
\r
102 `notmuch insert`, provided by the main notmuch binary.
\r
107 +`nmbug-status` now only matches local branches when reading
\r
108 +`status-config.json` from the `config` branch of the `NMBGIT`
\r
109 +repository. To help new users running `nmbug-status`, `nmbug clone`
\r
110 +now creates a local `config` branch tracking `origin/config`. Folks
\r
111 +who use `nmbug-status` with an in-Git config (i.e. you don't use the
\r
112 +`--config` option) who already have `NMBGIT` set up are encouraged to
\r
115 + git checkout config origin/config
\r
117 +in their `NMBGIT` repository (usually `~/.nmbug`).
\r
119 Notmuch 0.19 (2014-11-14)
\r
120 =========================
\r
122 @@ -178,14 +193,14 @@ nmbug-status
\r
123 `nmbug-status` can now optionally load header and footer templates
\r
124 from the config file. Use something like:
\r
128 - "header": "<!DOCTYPE html>\n<html lang="en">\n...",
\r
129 - "footer": "</body></html>",
\r
136 +"header": "<!DOCTYPE html>\n<html lang="en">\n...",
\r
137 +"footer": "</body></html>",
\r
145 diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
\r
146 index 932ec12..81f582c 100755
\r
147 --- a/devel/nmbug/nmbug
\r
148 +++ b/devel/nmbug/nmbug
\r
149 @@ -308,6 +308,7 @@ def clone(repository):
\r
151 _git(args=['config', '--unset', 'core.worktree'], wait=True)
\r
152 _git(args=['config', 'core.bare', 'true'], wait=True)
\r
153 + _git(args=['branch', 'config', 'origin/config'], wait=True)
\r
156 def _is_committed(status):
\r
157 diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
\r
158 index 19dc48a..e845c2a 100755
\r
159 --- a/devel/nmbug/nmbug-status
\r
160 +++ b/devel/nmbug/nmbug-status
\r
161 @@ -92,7 +92,7 @@ def read_config(path=None, encoding=None):
\r
163 # read only the first line from the pipe
\r
164 sha1_bytes = subprocess.Popen(
\r
165 - ['git', '--git-dir', nmbhome, 'show-ref', '-s', branch],
\r
166 + ['git', '--git-dir', nmbhome, 'show-ref', '-s', '--heads', branch],
\r
167 stdout=subprocess.PIPE).stdout.readline()
\r
168 sha1 = sha1_bytes.decode(encoding).rstrip()
\r