Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes

diff --git a/dc/9efa1ed3813680db2a9ca1d350b4ec45834790 b/dc/9efa1ed3813680db2a9ca1d350b4ec45834790
new file mode 100644 (file)
index 0000000..0e54187
--- /dev/null
+++ b/dc/9efa1ed3813680db2a9ca1d350b4ec45834790
@@ -0,0 +1,95 @@
+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 5B05A431FBD\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 18:01:37 -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 MYKHSAScN8Ix for <notmuch@notmuchmail.org>;\r
+       Wed,  9 Apr 2014 18:01:33 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 03B8B431FBC\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 18:01:32 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1WY3Mv-0004Y0-Hs; Wed, 09 Apr 2014 22:01:29 -0300\r
+Received: (nullmailer pid 4336 invoked by uid 1000); Thu, 10 Apr 2014\r
+       01:01:25 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: "W. Trevor King" <wking@tremily.us>\r
+Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}\r
+       changes\r
+In-Reply-To: <20140409210108.GB21805@odin.tremily.us>\r
+References: <878urg849d.fsf@zancas.localnet>\r
+       <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>\r
+       <871tx67nnx.fsf@zancas.localnet>\r
+       <20140409210108.GB21805@odin.tremily.us>\r
+User-Agent: Notmuch/0.17+164~g31fc76b (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 09 Apr 2014 22:01:25 -0300\r
+Message-ID: <87sipm576i.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: notmuch <notmuch@notmuchmail.org>\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: Thu, 10 Apr 2014 01:01:37 -0000\r
+\r
+"W. Trevor King" <wking@tremily.us> writes:\r
+\r
+> We need non-bare repositories to have remote-tracking branches\r
+> (distinct from local branches) [3], and we need remote-tracking\r
+> branches to have working @{upstream}.\r
+\r
+OK, I see what you mean, the repository has "bare = false". On the other\r
+hand we immediately blow away the work tree, and after the initial clone\r
+it seems to work fine to set bare = true. It might even make sense to\r
+apply\r
+\r
+\r
+diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug\r
+index d6f5213..b18ded7 100755\r
+--- a/devel/nmbug/nmbug\r
++++ b/devel/nmbug/nmbug\r
+@@ -134,6 +134,7 @@ sub do_clone {\r
+           $repository, $tempwork) == 0\r
+     or die "'git clone' exited with nonzero value\n";\r
+   git ('config', '--unset', 'core.worktree');\r
++  git ('config', 'core.bare', 'true');\r
+ }\r
+\r
+\r
+> I think that's reasonable support for my claim (and most of it is in\r
+> the original c200167 commit message), but maybe not?\r
+\r
+In any case, I think I think it's mainly a technicality, and that we\r
+want to keep the level of detail in the release notes down a bit.  If\r
+you don't like the above mini-patch, then maybe a NOTES section in the\r
+nmbug docs.\r
+\r
+>> Is the "remote repository" in step 1 meant to be the central repo? or\r
+>> just a backup?\r
+>\r
+> The backup.  If you have nothing to backup, you already got everything\r
+> back after cloning the central repo.\r
+\r
+It might be less confusing to explicitly use the word "backup" in step 1 then.\r