summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorVlad Dogaru <vdogaru@ixiacom.com>2014-04-07 13:19:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-07 22:37:12 (GMT)
commit4e49d95ece7e023106349875df05fed0601920a5 (patch)
treeaf957564c831c97b562006c2c23097b5f85d52ca /git-p4.py
parente4eef26d985177e4bdd32bf58b6ae40e7ae67289 (diff)
downloadgit-4e49d95ece7e023106349875df05fed0601920a5.zip
git-4e49d95ece7e023106349875df05fed0601920a5.tar.gz
git-4e49d95ece7e023106349875df05fed0601920a5.tar.bz2
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
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):