Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 21, 2019, 08:31 UTC
Message-ID: <xmqqd0mksk6n.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <878sx8lpqw.fsf@javad.com>

Sergey Organov <sorganov@gmail.com> writes:

Show 6 quoted lines

>> The same effect can be had by just reverting "let's allow -m1 for
>> single-parent commit", can't it?  That is a far simpler solution, I
>> would say.
>
> Those one didn't introduce the issue currently at hand, as we still
> don't allow merges by default, so why do we need to rewind it?

With it reverted, "[alias] cp = cherry-pick -m1" can be used to train the user to blindly pick a range that has a merge without thinking, which is what I meant by "ship has already sailed".

With it reverted, a range pick of a straight single strand of pearls would still work just fine. And the user is forced to think and chop a range with a merge into a set of subranges each of which is a single strand of pearls, plus picking individual merges (if picking these merges is really what the user wants, that is). As ensuring the users to think is the whole point of excercise, the original system before we allowed "-m1" for single parent commit was after all giving us the right balance, I guess, without another new options.