From: David Bremner <david@tethera.net>
To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org
Subject: Re: [PATCH] nmbug: Add 'clone' and replace FETCH_HEAD with
 @{upstream}
In-Reply-To:
 <80db13662a0313711ca3a91e338a63d35e64a83c.1391898002.git.wking@tremily.us>
References:
 <80db13662a0313711ca3a91e338a63d35e64a83c.1391898002.git.wking@tremily.us>
User-Agent: Notmuch/0.17+106~g0421995 (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-pc-linux-gnu)
Date: Sat, 08 Mar 2014 08:43:26 -0400
Message-ID: <87siqsrhch.fsf@zancas.localnet>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list

"W. Trevor King" <wking@tremily.us> writes:


> +sub do_clone {
> +  my $repository = shift;
> +  system ('git', 'clone', '--bare', $repository, $NMBGIT) == 0
> +    or die "'git clone' exited with nonzero value\n";
> +  my $branch = git ('symbolic-ref', 'HEAD');
> +  $branch =~ s|^refs/heads/||;
> +  git ('config', 'remote.origin.fetch', '+refs/heads/*:refs/remotes/origin/*');
> +  git ('config', "branch.$branch.remote", 'origin');
> +  git ('config', "branch.$branch.merge", 'refs/heads/$branch');
> +  do_fetch();
> +}

I think doing a fetch immediately after a clone deserves a comment.

>  
> @@ -473,7 +487,7 @@ sub diff_index {
>  sub diff_refs {
>    my $filter = shift;
>    my $ref1 = shift || 'HEAD';
> -  my $ref2 = shift || 'FETCH_HEAD';
> +  my $ref2 = shift || '@{upstream}';

I wonder about hard-coding '@{upstream}' in several places. What do you
think about a global "constant"? OF course it was hard-coded FETCH_HEAD
before, but I think not in quite as many places.