Pete Wyckoff <pw@xxxxxxxx> writes:
> vdogaru@xxxxxxxxxxx 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@xxxxxxxxxxx>
>
> 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@xxxxxxxx>
Thanks; will apply directly on 'master'.
>
>> ---
>> 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
>>
>>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html