Re: [PATCH] git-p4: explicitly specify that HEAD is a revision

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 7, 2014, 22:37 UTC
Message-ID: <xmqqioqklqag.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20140407220916.GA3635@padd.com>

Pete Wyckoff <pw@padd.com> writes:

Show 19 quoted lines

> vdogaru@ixiacom.com wrote on Mon, 07 Apr 2014 16:19 +0300:
>> 'git p4 rebase' fails with the following message if there is a file
>> named HEAD in the current directory:
>> 
>> 	fatal: ambiguous argument 'HEAD': both revision and filename
>> 	Use '--' to separate paths from revisions, like this:
>> 	'git <command> [<revision>...] -- [<file>...]'
>> 
>> Take the suggestion above and explicitly state that HEAD should be
>> treated as a revision.
>> 
>> Signed-off-by: Vlad Dogaru <vdogaru@ixiacom.com>
>
> This looks obviously good to me, thanks!
>
> Junio, could you carry it into the next release?  As a trivial
> fixup.
>
> Acked-by: Pete Wyckoff <pw@padd.com>

Thanks; will apply directly on 'master'.

Show 22 quoted lines

>
>> ---
>>  git-p4.py | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/git-p4.py b/git-p4.py
>> index cdfa2df..8d11b25 100755
>> --- a/git-p4.py
>> +++ b/git-p4.py
>> @@ -3086,7 +3086,7 @@ class P4Rebase(Command):
>>          print "Rebasing the current branch onto %s" % upstream
>>          oldHead = read_pipe("git rev-parse HEAD").strip()
>>          system("git rebase %s" % upstream)
>> -        system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
>> +        system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
>>          return True
>>  
>>  class P4Clone(P4Sync):
>> -- 
>> 1.8.5.2
>> 
>>