diff options
author | Vlad Dogaru <vdogaru@ixiacom.com> | 2014-04-07 16:19:11 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-07 15:37:12 -0700 |
commit | 4e49d95ece7e023106349875df05fed0601920a5 (patch) | |
tree | af957564c831c97b562006c2c23097b5f85d52ca | |
parent | MSVC: allow using ExtUtils::MakeMaker (diff) | |
download | tgif-4e49d95ece7e023106349875df05fed0601920a5.tar.xz |
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>
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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): |