From: ZheNing Hu <adlternative@gmail.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>,
git <git@vger.kernel.org>,
Matthias Buehlmann <Matthias.Buehlmann@mabulous.com>,
Jonathan Tan <jonathantanmy@google.com>
Subject: Re: Bug Report: Multi-line trailers containing empty lines break parsing
Date: Thu, 25 Mar 2021 17:33:23 +0800 [thread overview]
Message-ID: <CAOLTT8TFTcw9fkfPk-vi3REtZqCWYS28LEP5jfy-TmYuWf747g@mail.gmail.com> (raw)
In-Reply-To: <CAP8UFD0rRff7oCMH=DeTQ-tZw7STLwSHLecWxRr_rQVyHuxJuA@mail.gmail.com>
Christian Couder <christian.couder@gmail.com> 于2021年3月25日周四 下午3:54写道:
>
> On Tue, Mar 23, 2021 at 6:39 PM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Christian Couder <christian.couder@gmail.com> writes:
> >
> > > So I thought that blank lines should not appear in the trailers. And
> > > if any appears, it means that the trailers should start after the last
> > > blank line.
> >
> > I think that is a good principle to stick to.
> >
> > >> > - if the second "multi:" trailer did not have the funny blank line
> > >> > before "_two", the expected output would still be "multi:"
> > >> > followed by "one two three", iow, the line after the second
> > >> > "multi: one" is a total no-op? If we added many more " \n" lines
> > >> > there, they are all absorbed and ignored? It somehow feels wrong
> > >>
> > >> That's definitely the outcome of this patch, but I agree it feels wrong.
> > >> I'm not sure that we define the behavior that strictly in
> > >> git-interpret-trailers(1), so we have some wiggle room, I guess.
> > >
> > > Any patch to relax how blank lines and other aspects of trailers
> > > parsing in my opinion should come with some documentation change to
> > > explain what we now accept and what we don't accept, and also tests to
> > > enforce that.
> >
> > OK. But do we document clearly what we accept and we don't before
> > any change?
>
> Maybe it's not enough, but the doc already has the following:
>
> ------
> Existing trailers are extracted from the input message by looking for
> a group of one or more lines that (i) is all trailers, or (ii) contains at
> least one Git-generated or user-configured trailer and consists of at
> least 25% trailers.
> The group must be preceded by one or more empty (or whitespace-only) lines.
> The group must either be at the end of the message or be the last
> non-whitespace lines before a line that starts with '---' (followed by a
> space or the end of the line). Such three minus signs start the patch
> part of the message. See also `--no-divider` below.
>
> When reading trailers, there can be whitespaces after the
> token, the separator and the value. There can also be whitespaces
> inside the token and the value. The value may be split over multiple lines with
> each subsequent line starting with whitespace, like the "folding" in RFC 822.
> ------
Maybe I don't have enough right to speak on this issue, but I always think that
the empty line is intentional by the designer, especially when I test it.
next prev parent reply other threads:[~2021-03-25 9:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 21:54 Bug Report: Multi-line trailers containing empty lines break parsing Matthias Buehlmann
2021-02-16 2:29 ` Junio C Hamano
2021-02-16 18:07 ` Taylor Blau
2021-02-16 19:39 ` Junio C Hamano
2021-02-16 19:47 ` Taylor Blau
2021-03-23 15:17 ` Christian Couder
2021-03-23 17:39 ` Junio C Hamano
2021-03-25 7:53 ` Christian Couder
2021-03-25 9:33 ` ZheNing Hu [this message]
2021-03-25 18:16 ` Junio C Hamano
2021-03-26 10:25 ` ZheNing Hu
2021-03-25 18:08 ` Junio C Hamano
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOLTT8TFTcw9fkfPk-vi3REtZqCWYS28LEP5jfy-TmYuWf747g@mail.gmail.com \
--to=adlternative@gmail.com \
--cc=Matthias.Buehlmann@mabulous.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).