From: Jonathan Tan <jonathantanmy@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Tan <jonathantanmy@google.com>,
Max Bernstein via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
Max Bernstein <donotemailthisaddress@bernsteinbear.com>,
Max Bernstein <max@bernsteinbear.com>,
Christian Couder <christian.couder@gmail.com>
Subject: Re: [PATCH v2] trailer: allow spaces in tokens
Date: Thu, 18 Aug 2022 10:56:00 -0700 [thread overview]
Message-ID: <20220818175600.3531267-1-jonathantanmy@google.com> (raw)
In-Reply-To: <xmqqk075qyq0.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> "Max Bernstein via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > Range-diff vs v1:
> >
> > 1: 404a6d1b193 ! 1: 4d490851ac2 trailer: allow spaces in tokens
> > @@ Commit message
> >
> > Signed-off-by: Max Bernstein <max@bernsteinbear.com>
> >
> > + ## t/t4014-format-patch.sh ##
> > +@@ t/t4014-format-patch.sh: test_expect_success 'signoff: not really a signoff' '
> > + 4:Subject: [PATCH] subject
> > + 8:
> > + 9:I want to mention about Signed-off-by: here.
> > +- 10:
> > +- 11:Signed-off-by: C O Mitter <committer@example.com>
> > ++ 10:Signed-off-by: C O Mitter <committer@example.com>
> > + EOF
> > + test_cmp expect actual
> > + '
>
> So, the updated code mistook the body of the message that is not a
> sign-off, because there is a colon on the line, the line does not
> begin with the colon, and everything before the colon is an alnum or
> a whitespace, so squashed the paragraph break before the real
> trailer block and the last line of the body and made it a body-less
> commit log message?
>
> This might be a good demonstration of why it is a mistaken design to
> allow whitespaces, which may steer us toward fixing the documentation?
>
> I dunno. What do others think?
Yeah, this was the same issue we discussed a few years ago [1]. "git
commit -s" has never supported spaces before the colon (at least, it did
not support it before my patch set in [1] and does not support it now)
so it seems that having no spaces is already the established convention,
and I think that interpret-trailers should follow it. I would agree that
we should fix the documentation to match the current behavior.
[1] https://lore.kernel.org/git/a416ab9b-ff1f-9a71-3e58-60fd4f8a6b8e@google.com/
next prev parent reply other threads:[~2022-08-18 17:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-18 7:06 [PATCH] trailer: allow spaces in tokens Max Bernstein via GitGitGadget
2022-08-18 7:54 ` [PATCH v2] " Max Bernstein via GitGitGadget
2022-08-18 16:54 ` Junio C Hamano
2022-08-18 17:56 ` Jonathan Tan [this message]
2022-08-18 19:03 ` Maxwell Bernstein
2022-08-18 20:46 ` Christian Couder
2022-08-18 21:31 ` Junio C Hamano
2022-08-19 4:33 ` Junio C Hamano
2022-08-19 10:29 ` Christian Couder
2022-08-22 13:58 ` Johannes Schindelin
2022-08-23 14:06 ` [PATCH] Documentation: clarify whitespace rules for trailers Christian Couder
2022-08-24 18:13 ` Junio C Hamano
2022-08-25 11:59 ` Christian Couder
2022-08-25 16:20 ` Junio C Hamano
2022-08-30 10:50 ` [PATCH v2] " Christian Couder
2022-08-30 17:20 ` Junio C Hamano
2022-08-18 16:48 ` [PATCH] trailer: allow spaces in tokens Junio C Hamano
2022-08-18 17:52 ` Jonathan Tan
2022-08-18 17:58 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220818175600.3531267-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=christian.couder@gmail.com \
--cc=donotemailthisaddress@bernsteinbear.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=max@bernsteinbear.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.
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 NNTP newsgroup(s).