| commit | 6d5b93f29f5362b9b84954d87684705227984f9e | |
| author | Clemens Buchacher <drizzd@aon.at> | |
| Sat, 14 Apr 2012 19:04:48 +0000 (14 21:04 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 Apr 2012 20:33:31 +0000 (15 13:33 -0700) | ||
| tree | 14a0838e5657c9e29630b057d99ec4f460553743 | treesnapshot (tar.gz zip) |
| parent | e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d | commitdiff |
cherry-pick: do not expect file arguments
If a commit-ish passed to cherry-pick or revert happens to have a file
of the same name, git complains that the argument is ambiguous and
advises to use '--'. To make things worse, the '--' argument is removed
by parse_options, und so passing '--' has no effect.
Instead, always interpret cherry-pick/revert arguments as revisions.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If a commit-ish passed to cherry-pick or revert happens to have a file
of the same name, git complains that the argument is ambiguous and
advises to use '--'. To make things worse, the '--' argument is removed
by parse_options, und so passing '--' has no effect.
Instead, always interpret cherry-pick/revert arguments as revisions.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/revert.c | diffblobblamehistory | |
| revision.c | diffblobblamehistory | |
| revision.h | diffblobblamehistory |