Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 4e49d95

Browse files
ddvladgitster
authored andcommitted
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 <[email protected]> Acked-by: Pete Wyckoff <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e4eef26 commit 4e49d95

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3086,7 +3086,7 @@ def rebase(self):
30863086
print "Rebasing the current branch onto %s" % upstream
30873087
oldHead = read_pipe("git rev-parse HEAD").strip()
30883088
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)
30903090
return True
30913091

30923092
class P4Clone(P4Sync):

0 commit comments

Comments
 (0)