From: Anthony Baire <anthony.baire@irisa.fr>
Date: Wed, 27 Nov 2013 20:30:51 GMT
Subject: Re: [PATCH] subtree: fix argument validation in add/pull/push
Message-ID: <5296567B.5080704@irisa.fr>
In-Reply-To: <87siuhfy9q.fsf@thomasrast.ch>

On 27/11/2013 20:19, Thomas Rast wrote:
> Anthony Baire <Anthony.Baire@irisa.fr> writes:
>
>> When working with a remote repository add/pull/push do not accept a
>> <refspec> as parameter but just a <ref>. They should accept any
>> well-formatted ref name.
> [...]
>>   - update the doc to use <ref> instead of <refspec>
> [...]
>>   OPTS_SPEC="\
>>   git subtree add   --prefix=<prefix> <commit>
>> -git subtree add   --prefix=<prefix> <repository> <commit>
>> +git subtree add   --prefix=<prefix> <repository> <ref>
>>   git subtree merge --prefix=<prefix> <commit>
>> -git subtree pull  --prefix=<prefix> <repository> <refspec...>
>> -git subtree push  --prefix=<prefix> <repository> <refspec...>
>> +git subtree pull  --prefix=<prefix> <repository> <ref>
>> +git subtree push  --prefix=<prefix> <repository> <ref>
>>   git subtree split --prefix=<prefix> <commit...>
> [...]
>> @@ -68,7 +68,7 @@ COMMANDS
>>   --------
>>   add::
>>   	Create the <prefix> subtree by importing its contents
>> -	from the given <refspec> or <repository> and remote <refspec>.
>> +	from the given <commit> or <repository> and remote <ref>.
> AFAICS you are changing refspec->commit in the manpage, but commit->ref
> in the usage message for 'subtree add'?  How does this line up?
>
'git subtree add' accepts a commit when working with the local 
repository and a ref when working with a remote repository:

	git subtree add   --prefix=<prefix> <commit>
	git subtree add   --prefix=<prefix> <repository> <ref>

but the manpage was no in sync with the code. I fixed it for the local 
case too.
Anthony