diff options
author | Jeff King <peff@peff.net> | 2013-10-10 12:41:17 -0400 |
---|---|---|
committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-10 15:33:46 -0700 |
commit | d644c5502fc576904a07fab35f43540fa9f2e7c2 (patch) | |
tree | 1ff885551bca9cb7c7e6c527fc49a755d20b93e1 /Documentation/git-prune.txt | |
parent | cherry-pick: allow "-" as abbreviation of '@{-1}' (diff) | |
download | tgif-d644c5502fc576904a07fab35f43540fa9f2e7c2.tar.xz |
cherry-pick: handle "-" after parsing options
Currently, we only try converting argv[1] from "-" into "@{-1}". This
means we do not notice "-" when used together with an option. Worse,
when "git cherry-pick" is run with no options, we segfault. Fix this
by doing the substitution after we have checked that there is
something in argv to cherry-pick and know any remaining options are
meant for the revision-listing machinery.
This still does not handle "-" after the first non-cherry-pick option.
For example,
git cherry-pick foo~2 - bar~5
and
git cherry-pick --no-merges -
will still dump usage.
Reported-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'Documentation/git-prune.txt')
0 files changed, 0 insertions, 0 deletions