git-p4: explicitly specify that HEAD is a revision
'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> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vlad Dogaru committed
Apr 7, 2014 at 16:19 UTC
4e49d95ece7e023106349875df05fed0601920a5
1 file changed
+1
-1
git-p4.py
+1
-1
@@ -3086,7 +3086,7 @@ class P4Rebase(Command):
3086
print "Rebasing the current branch onto %s" % upstream
3087
oldHead = read_pipe("git rev-parse HEAD").strip()
3088
system("git rebase %s" % upstream)
3089
- system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
3089
+ system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
3090
return True
3091
3092
class P4Clone(P4Sync):