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