| commit | 9926f66fbd4392c9c7c05fae83e80bc12e0be889 | |
| author | Slava Kardakov <ojab@ojab.ru> | |
| Wed, 5 Jun 2013 18:31:27 +0000 (5 11:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Jun 2013 20:38:48 +0000 (12 13:38 -0700) | ||
| tree | 193e7b45d2dde3c5d23607b33c6e0a2531cec059 | treesnapshot (tar.gz zip) |
| parent | 4d1c565e1fb4e76c391448cdf85fe7c132bbb390 | commitdiff |
Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist
When a file (or a directory) called HEAD exists in the working tree,
internal calls git svn makes trigger "did you mean a revision or a
path?" ambiguity check.
$ git svn rebase
fatal: ambiguous argument 'HEAD': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
rev-list --first-parent --pretty=medium HEAD: command returned error: 128
Explicitly disambiguate by adding "--" after the revision.
Signed-off-by: Slava Kardakov <ojab@ojab.ru>
Reviewed-by: Jeff King <peff@peff.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a file (or a directory) called HEAD exists in the working tree,
internal calls git svn makes trigger "did you mean a revision or a
path?" ambiguity check.
$ git svn rebase
fatal: ambiguous argument 'HEAD': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
rev-list --first-parent --pretty=medium HEAD: command returned error: 128
Explicitly disambiguate by adding "--" after the revision.
Signed-off-by: Slava Kardakov <ojab@ojab.ru>
Reviewed-by: Jeff King <peff@peff.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-svn.perl | diffblobblamehistory |