From: Linus Arver <linusa@google.com>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: Philippe Blain <levraiphilippeblain@gmail.com>,
Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCH] trailer: fix comment/cut-line regression with opts->no_divider
Date: Thu, 07 Mar 2024 18:21:24 -0800 [thread overview]
Message-ID: <owlyfrx14g63.fsf@fine.c.googlers.com> (raw)
In-Reply-To: <20240220010936.GA1793660@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> On Mon, Feb 19, 2024 at 10:42:45AM -0800, Junio C Hamano wrote:
> [...]
>
> The fix itself is pretty simple: instead of returning early, no_divider
> just skips the "---" handling but still calls ignored_log_message_bytes().
I realize I am late to the discussion, but this fix (and patch)
looks right to me. FWIW I independently discovered the same problem and
figured out a fix locally in my larger refactor of this area (with the
same fix, to always call ignored_log_message_bytes() regardless of
no_divider). Thank you Peff!
Sorry for introducing the regression. My enthusiasm in changing things
up without unit tests is regrettable.
prev parent reply other threads:[~2024-03-08 2:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 21:04 [BUG] git commit --trailer --verbose puts trailer below scissors line Philippe Blain
2024-02-16 21:19 ` Junio C Hamano
2024-02-16 22:34 ` Linus Arver
2024-02-17 6:04 ` Jeff King
2024-02-19 17:41 ` Philippe Blain
2024-02-19 18:42 ` Junio C Hamano
2024-02-20 1:09 ` [PATCH] trailer: fix comment/cut-line regression with opts->no_divider Jeff King
2024-02-20 3:26 ` Junio C Hamano
2024-03-08 2:21 ` Linus Arver [this message]
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=owlyfrx14g63.fsf@fine.c.googlers.com \
--to=linusa@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=levraiphilippeblain@gmail.com \
--cc=peff@peff.net \
/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).