Re: [PATCH v2] rebase -i: do leave commit message intact in fixup! chains

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 28, 2021, 20:18 UTC
Message-ID: <xmqq4kj0x1c3.fsf@gitster.c.googlers.com>
In-Reply-To: <nycvar.QRO.7.76.6.2101281724130.54@tvgsbejvaqbjf.bet>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 9 quoted lines

>> >  #define CLEANUP_MSG (1<<3)
>> >  #define VERIFY_MSG  (1<<4)
>> >  #define CREATE_ROOT_COMMIT (1<<5)
>> > +#define VERBATIM_MSG (1<<6)
>>
>> It somewhat bothers me that these pretend to be orthogonal options
>> that can be mixed and matched, but ...
>
> I did something similar in spirit in the latest iteration.

Looks good. We do not expect for the BUG() to trigger as long as programmers are careful, but it is better to be careful.

Another possibility would have been, as VERBATIM is what only we set programmatically when we do not want any clean-up to happen, make it override CLEANUP, but what is written in the updated patch is safer, I would think.

Will queue v3.

Thanks.