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>
Jeff King committed
Oct 10, 2013 at 12:41 UTC
d644c5502fc576904a07fab35f43540fa9f2e7c2
2 files changed
+14
-2
builtin/revert.c
+2
-2
@@ -198,6 +198,8 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
198
opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
199
if (argc < 2)
200
usage_with_options(usage_str, options);
201
+ if (!strcmp(argv[1], "-"))
202
+ argv[1] = "@{-1}";
203
memset(&s_r_opt, 0, sizeof(s_r_opt));
204
s_r_opt.assume_dashdash = 1;
205
argc = setup_revisions(argc, argv, opts->revs, &s_r_opt);
@@ -232,8 +234,6 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
234
memset(&opts, 0, sizeof(opts));
235
opts.action = REPLAY_PICK;
236
git_config(git_default_config, NULL);
235
- if (!strcmp(argv[1], "-"))
236
- argv[1] = "@{-1}";
237
parse_args(argc, argv, &opts);
238
res = sequencer_pick_revisions(&opts);
239
if (res < 0)
t/t3501-revert-cherry-pick.sh
+12
@@ -129,4 +129,16 @@ test_expect_success 'cherry-pick "-" is meaningless without checkout' '
129
)
130
'
131
132
+test_expect_success 'cherry-pick "-" works with arguments' '
133
+ git checkout -b side-branch &&
134
+ test_commit change actual change &&
135
+ git checkout master &&
136
+ git cherry-pick -s - &&
137
+ echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
138
+ git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
139
+ test_cmp expect signoff &&
140
+ echo change >expect &&
141
+ test_cmp expect actual
142
+'
143
+
144
test_done