From: Pete Wyckoff <pw@padd•com>
To: Vlad Dogaru <vdogaru@ixiacom•com>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] git-p4: explicitly specify that HEAD is a revision
Date: Mon, 7 Apr 2014 18:09:16 -0400 [thread overview]
Message-ID: <20140407220916.GA3635@padd.com> (raw)
In-Reply-To: <20140407131911.GB17654@ixro-vdogaru.ixiacom.com>
vdogaru@ixiacom•com 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@ixiacom•com>
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@padd•com>
> ---
> 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
>
>
next prev parent reply other threads:[~2014-04-07 22:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-07 13:19 [PATCH] git-p4: explicitly specify that HEAD is a revision Vlad Dogaru
2014-04-07 22:09 ` Pete Wyckoff [this message]
2014-04-07 22:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140407220916.GA3635@padd.com \
--to=pw@padd$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=vdogaru@ixiacom$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox