Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified
- From
Sergey Organov <sorganov@gmail.com>
- Date
- Dec 12, 2018, 05:35 UTC
- Message-ID
- <871s6n5mtd.fsf@javad.com>
- In-Reply-To
- <xmqqsh5gt9sm.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 7 quoted lines
> Sergey Organov <sorganov@gmail.com> writes: > >> 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. >
[...]
Show 7 quoted lines
> Now, it appears, at least to me, that the world pretty much accepted > that the first-parent worldview is often very convenient and worth > supporting by the tool, so the next logical step might be to set > opts->mainline to 1 by default (and allow an explicit "-m $n" from > the command line to override it). But that should happen after this > patch lands---it is logically a separate step, I would think. >
[...]
Show 10 quoted lines
>> + } else if (1 < opts->mainline) >> + /* Non-first parent explicitly specified as mainline for >> + * non-merge commit */ > > Style. > > /* > * Our multi-line comments are to be > * formatted like this. > */
Comment style fixed:
-- 8< --
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. Besides, as mainline is always the only parent for a non-merge commit, it made little sense to disable it in the first place.
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