diff options
| author | Kristoffer Haugsbakk <code@khaugsbakk.name> | 2026-04-11 22:15:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-13 08:26:43 -0700 |
| commit | 444e423f81087e71d396ba11c6734e66a40206cb (patch) | |
| tree | 028f5f9a337b8d76673d595dac6b0882e56f9b7c /t/t4013/diff.format-patch_--inline_--stdout_initial..main^ | |
| parent | b10e0cb1f391a4466f8d7c4b2550a8b89fda3573 (diff) | |
| download | git-444e423f81087e71d396ba11c6734e66a40206cb.tar.gz git-444e423f81087e71d396ba11c6734e66a40206cb.zip | |
doc: am: revert Message-ID trailer claim
I claimed in 3c18135b (doc: am: say that --message-id adds a trailer,
2026-02-09) that `git am --message-id` adds a Git trailer. But that
isn’t the case; for the case of a commit message with a subject, body,
and no trailer block:
<subject>
<paragrah>
It just appends the line right after `paragraph`:
<subject>
<paragraph>
Message-ID: <message-id_trailer.323@msgid.xyz>
It does work for two other cases though, namely subject-only and with an
existing trailer block.
This is at best an inconsistency and arguably a bug, but we’re at the
trailing end of the release cycle now. So reverting the doc is safer
than making msg-id act as a trailer, for now.
Revert this hunk from commit 3c18135b except the only useful
change (“Also use inline-verbatim for `Message-ID`”).
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..main^')
0 files changed, 0 insertions, 0 deletions