From: "Maciej W. Rozycki" <macro@wdc.com>
To: Florian Weimer <fweimer@redhat.com>
Cc: Carlos O'Donell <carlos@redhat.com>,
"Gabriel F. T. Gomes" <gabriel@inconstante.net.br>,
Siddhesh Poyarekar <siddhesh@gotplt.org>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: When can we stop writing ChangeLogs?
Date: Mon, 7 Oct 2019 10:40:08 +0100 (BST) [thread overview]
Message-ID: <alpine.LFD.2.21.1910071029150.8305@redsun52.ssa.fujisawa.hgst.com> (raw)
In-Reply-To: <87pnj9lyd3.fsf@oldenburg2.str.redhat.com>
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.
Maciej
next prev parent reply other threads:[~2019-10-07 9:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 18:55 When can we stop writing ChangeLogs? Siddhesh Poyarekar
2019-09-24 23:21 ` Adhemerval Zanella
2019-09-28 3:16 ` Carlos O'Donell
2019-09-30 14:30 ` Siddhesh Poyarekar
2019-09-30 15:56 ` Florian Weimer
2019-09-30 16:56 ` Siddhesh Poyarekar
2019-09-30 18:36 ` Florian Weimer
2019-09-30 19:27 ` Siddhesh Poyarekar
2019-09-30 19:42 ` Florian Weimer
2019-10-04 1:37 ` Gabriel F. T. Gomes
2019-10-07 2:27 ` Carlos O'Donell
2019-10-07 9:05 ` Florian Weimer
2019-10-07 9:40 ` Maciej W. Rozycki [this message]
2019-10-07 9:47 ` Florian Weimer
2019-09-30 19:31 ` Carlos O'Donell
2019-09-30 19:39 ` Siddhesh Poyarekar
2019-09-30 19:41 ` Joseph Myers
2019-09-30 19:53 ` Carlos O'Donell
2019-10-01 17:41 ` Florian Weimer
2019-10-01 20:18 ` Joseph Myers
2019-10-02 9:30 ` Florian Weimer
2019-09-30 19:52 ` Maciej W. Rozycki
2019-10-07 12:56 ` Florian Weimer
2019-10-07 13:31 ` Florian Weimer
2019-10-07 14:49 ` Siddhesh Poyarekar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.21.1910071029150.8305@redsun52.ssa.fujisawa.hgst.com \
--to=macro@wdc.com \
--cc=adhemerval.zanella@linaro.org \
--cc=carlos@redhat.com \
--cc=fweimer@redhat.com \
--cc=gabriel@inconstante.net.br \
--cc=libc-alpha@sourceware.org \
--cc=siddhesh@gotplt.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).