--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 EE4E9431FCB\r
+ for <notmuch@notmuchmail.org>; Mon, 23 Mar 2015 00:06:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+ tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 h9y7y86RhnI5 for <notmuch@notmuchmail.org>;\r
+ Mon, 23 Mar 2015 00:06:41 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 781CF431FC7\r
+ for <notmuch@notmuchmail.org>; Mon, 23 Mar 2015 00:06:41 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 345BA100086;\r
+ Mon, 23 Mar 2015 09:06:14 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v4] nmbug-status: Use 'show-ref --heads' for loading\r
+ configs\r
+In-Reply-To:\r
+ <27b065bda7a31387f8f08069f30a2c2103ffc4e2.1427064160.git.wking@tremily.us>\r
+References:\r
+ <27b065bda7a31387f8f08069f30a2c2103ffc4e2.1427064160.git.wking@tremily.us>\r
+User-Agent: Notmuch/0.19+92~g61c04e8 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 23 Mar 2015 09:06:13 +0200\r
+Message-ID: <m2oankmbve.fsf@guru.guru-group.fi>\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: Mon, 23 Mar 2015 07:06:45 -0000\r
+\r
+On Mon, Mar 23 2015, "W. Trevor King" <wking@tremily.us> wrote:\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
+> The only change from v3 [1] is dropping the accidental indentation\r
+> hunk that started with '@@ -178,14 +193,14 @@ nmbug-status'. Thanks\r
+> to Tomi for pointing this out on IRC.\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>\r
+> [1]: id: e9d25cc269b7bcc058627466adfa2835256b6e76.1427012574.git.wking@tremily.us\r
+> http://thread.gmane.org/gmane.mail.notmuch.general/20356\r
+>\r
+> NEWS | 15 +++++++++++++++\r
+> devel/nmbug/nmbug | 1 +\r
+> devel/nmbug/nmbug-status | 2 +-\r
+> 3 files changed, 17 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/NEWS b/NEWS\r
+> index 70ad3f3..336a7c3 100644\r
+> --- a/NEWS\r
+> +++ b/NEWS\r
+> @@ -23,6 +23,21 @@ Contrib\r
+> previously provided by `notmuch-deliver` should now be provided by\r
+> `notmuch insert`, provided by the main notmuch binary.\r
+> \r
+> +nmbug-status\r
+> +------------\r
+> +\r
+> +`nmbug-status` now only matches local branches when reading\r
+> +`status-config.json` from the `config` branch of the `NMBGIT`\r
+> +repository. To help new users running `nmbug-status`, `nmbug clone`\r
+> +now creates a local `config` branch tracking `origin/config`. Folks\r
+> +who use `nmbug-status` with an in-Git config (i.e. you don't use the\r
+> +`--config` option) who already have `NMBGIT` set up are encouraged to\r
+> +run:\r
+> +\r
+> + git checkout config origin/config\r
+> +\r
+> +in their `NMBGIT` repository (usually `~/.nmbug`).\r
+> +\r
+> Notmuch 0.19 (2014-11-14)\r
+> =========================\r
+> \r
+> diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug\r
+> index 932ec12..81f582c 100755\r
+> --- a/devel/nmbug/nmbug\r
+> +++ b/devel/nmbug/nmbug\r
+> @@ -308,6 +308,7 @@ def clone(repository):\r
+> wait=True)\r
+> _git(args=['config', '--unset', 'core.worktree'], wait=True)\r
+> _git(args=['config', 'core.bare', 'true'], wait=True)\r
+> + _git(args=['branch', 'config', 'origin/config'], wait=True)\r
+> \r
+> \r
+> def _is_committed(status):\r
+> diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
+> index 19dc48a..e845c2a 100755\r
+> --- a/devel/nmbug/nmbug-status\r
+> +++ b/devel/nmbug/nmbug-status\r
+> @@ -92,7 +92,7 @@ def read_config(path=None, encoding=None):\r
+> \r
+> # read only the first line from the pipe\r
+> sha1_bytes = subprocess.Popen(\r
+> - ['git', '--git-dir', nmbhome, 'show-ref', '-s', branch],\r
+> + ['git', '--git-dir', nmbhome, 'show-ref', '-s', '--heads', branch],\r
+> stdout=subprocess.PIPE).stdout.readline()\r
+> sha1 = sha1_bytes.decode(encoding).rstrip()\r
+> if not sha1:\r
+> -- \r
+> 2.1.0.60.g85f0837\r
projects / notmuch-archives.git / commitdiff