Re: When can we stop writing ChangeLogs?

[Florian Weimer <fweimer@redhat.com>]

* Maciej W. Rozycki:

> On Mon, 7 Oct 2019, Florian Weimer wrote:
>
>> > The patch *should* conform to git am --scissors for cutting out non-patch
>> > parts.
>> 
>> To be clear here, the problem is not the scissors processing.  What I
>> find very confusing is that scissors does not drop anything.  It is just
>> a boundary between the commit message (taken verbatim) and the part
>> which is parsed as a patch.  This means that the part of the scissors is
>> not actually ignored by git am; it gets passed to the patch parser in
>> git apply, and what happens then entirely depends on the patch parser
>> (which may or may not match what the human eye sees).
>
>  Hmm, aren't you talking about the three-dash separator by any chance, 
> which has nothing to do with the scissors line?
>
>  I just made a little test by adding:
>
> discussion
> 8<-------------------------------------------------------------------->8
>
> at the beginning of the message body of a git-am-compliant patch I 
> recently processed and fed it to `git mailinfo --scissors' (which is what 
> `git am' uses under the hood) and it correctly stripped "discussion" and 
> the scissors line in producing the commit message.

Even without --scissors, you can put comments *after* the commit
message, after a --- separator.  Then the text will be interpreted as a
patch by git apply and (usually) ignored.

Thanks,
Florian