Re: [PATCH v2] nmbug: Add 'clone' and replace FETCH_HEAD with @{upstream}

diff --git a/48/2b3c0773b0a3ca91f541b6c1c507747891ea23 b/48/2b3c0773b0a3ca91f541b6c1c507747891ea23
new file mode 100644 (file)
index 0000000..f7309eb
--- /dev/null
+++ b/48/2b3c0773b0a3ca91f541b6c1c507747891ea23
@@ -0,0 +1,70 @@
+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 1BBC5431FBC\r
+       for <notmuch@notmuchmail.org>; Sun,  6 Apr 2014 05:29:31 -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 tomDDjM9e0tA for <notmuch@notmuchmail.org>;\r
+       Sun,  6 Apr 2014 05:29:23 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224]) (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E37DD431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  6 Apr 2014 05:29:22 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.72) (envelope-from <david@tethera.net>)\r
+       id 1WWmBQ-0003W8-KP; Sun, 06 Apr 2014 12:28:20 +0000\r
+Received: (nullmailer pid 17199 invoked by uid 1000); Sun, 06 Apr 2014\r
+       12:27:59 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH v2] nmbug: Add 'clone' and replace FETCH_HEAD with\r
+       @{upstream}\r
+In-Reply-To:\r
+ <de7dd9d4021cd17350df4423bc13f3da35f2b324.1394410765.git.wking@tremily.us>\r
+References:\r
+ <de7dd9d4021cd17350df4423bc13f3da35f2b324.1394410765.git.wking@tremily.us>\r
+User-Agent: Notmuch/0.17+170~gf516b7c (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 06 Apr 2014 09:27:59 -0300\r
+Message-ID: <87d2gu4p80.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, 06 Apr 2014 12:29:31 -0000\r
+\r
+"W. Trevor King" <wking@tremily.us> writes:\r
+\r
+> With two branches getting fetched (master and config), the branch\r
+> referenced by FETCH_HEAD is ambiguous.  For example, I have:\r
+>\r
+>   $ cat FETCH_HEAD\r
+>   41d7bfa7184cc93c9dac139d1674e9530799e3b0 \\r
+>     not-for-merge   branch 'config' of http://nmbug.tethera.net/git/nmbug-tags\r
+>   acd379ccb973c45713eee9db177efc530f921954 \\r
+>     not-for-merge   branch 'master' of http://nmbug.tethera.net/git/nmbug-tags\r
+\r
+This patch seems OK.  I think it makes sense to have an "nmbug clone"\r
+command; perhaps the implementation can be simplified in the future (or\r
+perhaps not).\r
+\r
+d\r