This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: When can we stop writing ChangeLogs?
- From: Florian Weimer <fweimer at redhat dot com>
- To: "Maciej W. Rozycki" <macro at wdc dot com>
- Cc: Carlos O'Donell <carlos at redhat dot com>, "Gabriel F. T. Gomes" <gabriel at inconstante dot net dot br>, Siddhesh Poyarekar <siddhesh at gotplt dot org>, Adhemerval Zanella <adhemerval dot zanella at linaro dot org>, libc-alpha at sourceware dot org
- Date: Mon, 07 Oct 2019 11:47:38 +0200
- Subject: Re: When can we stop writing ChangeLogs?
- References: <6ebd0e52-a18f-15fc-f4ab-cf2c3afc74e9@gotplt.org> <f656068c-1307-8041-fece-efbb81dfc093@linaro.org> <3bd4b069-e16b-af68-fb2f-17d2458bece5@redhat.com> <e2071ccb-2e31-cea4-84fc-e8353abe0674@gotplt.org> <878sq522xz.fsf@oldenburg2.str.redhat.com> <52634368-ee1e-23d1-1d61-de0057e03829@gotplt.org> <87ftkdzl4v.fsf@oldenburg2.str.redhat.com> <5e38ded2-811f-d5b6-872d-1db24d836576@gotplt.org> <87tv8ty3iv.fsf@oldenburg2.str.redhat.com> <20191003223709.4b6e1c40@tereshkova> <f6d349fd-0920-47f8-e88e-5c61d1ea24c8@redhat.com> <87pnj9lyd3.fsf@oldenburg2.str.redhat.com> <alpine.LFD.2.21.1910071029150.8305@redsun52.ssa.fujisawa.hgst.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