diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2018-12-14 07:53:51 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-12-26 14:43:22 -0800 |
| commit | 37897bfc27d3003dddf7722113e676e925fe9e21 (patch) | |
| tree | 230d4d15ddc32927c306fc6bc7fd397d35bf4809 /sequencer.c | |
| parent | t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks (diff) | |
| download | tgif-37897bfc27d3003dddf7722113e676e925fe9e21.tar.xz | |
cherry-pick: do not error on non-merge commits when '-m 1' is specified
When cherry-picking multiple commits, it's impossible to have both
merge- and non-merge commits on the same command-line. Not specifying
'-m 1' results in cherry-pick refusing to handle merge commits, while
specifying '-m 1' fails on non-merge commits.
This patch allows '-m 1' for non-merge commits. As mainline is always
the only parent for a non-merge commit, it makes little sense to
disable it.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index e1a4dd15f1..d0fd61b0b3 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1766,9 +1766,13 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, return error(_("commit %s does not have parent %d"), oid_to_hex(&commit->object.oid), opts->mainline); parent = p->item; - } else if (0 < opts->mainline) - return error(_("mainline was specified but commit %s is not a merge."), - oid_to_hex(&commit->object.oid)); + } else if (1 < opts->mainline) + /* + * Non-first parent explicitly specified as mainline for + * non-merge commit + */ + return error(_("commit %s does not have parent %d"), + oid_to_hex(&commit->object.oid), opts->mainline); else parent = commit->parents->item; |