Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 17, 2019, 18:07 UTC
Message-ID: <xmqq5zo01qnv.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CAOc6eta-jX93k6twcrJOeRt+JHtLk4mUs7YD_bG=Ggvw4thAZQ@mail.gmail.com>

Edmundo Carmona Antoranz <eantoranz@gmail.com> writes:

Show 13 quoted lines

> On Fri, Jul 12, 2019 at 11:18 PM Edmundo Carmona Antoranz
> <eantoranz@gmail.com> wrote:
>>
>> Option -m can be used to defined the message for the revision instead
>> of the default message that contains all squashed revisions info.
>>
>
> I have noticed that just adding the support for -m in squash is more
> complex than this patch is reaching so I think I will break this patch
> into two parts:
> - squash in a shot if there are no conflicts
> - support -m with squash
> Disregard this patch, please.

Sure. I started skimming and then gave up after seeing that quite a lot of code has been shuffled around without much explanation (e.g. printing of "Squash commit -- not updating HEAD" is gone from the callee and now it is a responsibility of the caller), making it harder than necessary to see if there is any unintended behaviour change when the new feature is not in use. Whatever you are trying, it does look like the change deserves to be split into a smaller pieces to become more manageable.

Thanks.