[PATCH v3 2/4] cherry-pick: do not error on non-merge commits when '-m 1' is specified
- From
Sergey Organov <sorganov@gmail.com>
- Date
- Dec 14, 2018, 04:53 UTC
- Message-ID
- <a8b86bc307141963d0ce6b8f8710b38bd802e302.1546789304.git.sorganov@gmail.com>
- In-Reply-To
- <cover.1546789223.git.sorganov@gmail.com>
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> --- sequencer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c index e1a4dd1..d0fd61b 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;
-- 2.10.0.1.g57b01a3