{"thread":{"id":"65468","subject":"[PATCH] doc: am: revert Message-ID trailer claim","startedAt":"2026-04-11T20:16:00Z","lastAt":"2026-04-11T20:16:00Z","messageCount":1,"participants":["kristofferhaugsbakk@fastmail.com"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"541429","messageId":"msg-id_is_not_trailer.570@msgid.xyz","threadId":"65468","inReplyTo":null,"subject":"[PATCH] doc: am: revert Message-ID trailer claim","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-04-11T20:15:50Z","receivedAt":"2026-04-11T20:16:00Z","isPatch":true,"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nI claimed in 3c18135b (doc: am: say that --message-id adds a trailer,\n2026-02-09) that `git am --message-id` adds a Git trailer. But that\nisn’t the case; for the case of a commit message with a subject, body,\nand no trailer block:\n\n    <subject>\n\n    <paragrah>\n\nIt just appends the line right after `paragraph`:\n\n    <subject>\n\n    <paragraph>\n    Message-ID: <message-id_trailer.323@msgid.xyz>\n\nIt does work for two other cases though, namely subject-only and with an\nexisting trailer block.\n\nThis is at best an inconsistency and arguably a bug, but we’re at the\ntrailing end of the release cycle now. So reverting the doc is safer\nthan making msg-id act as a trailer, for now.\n\nRevert this hunk from commit 3c18135b except the only useful\nchange (“Also use inline-verbatim for `Message-ID`”).\n\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n\nNotes (series):\n    Topic name: kh/doc-am-message-id-not-trailer\n    \n    Topic summary: Revert claim that `git am --message-id` adds the msg-id\n    header as a trailer.\n    \n    This is based on topic kh/doc-am-xref which was merged to `master` in\n    05c4af5c (Merge branch 'kh/doc-am-xref', 2026-03-02).\n\n Documentation/git-am.adoc | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-am.adoc b/Documentation/git-am.adoc\nindex 403181baa9f..14f83a8920a 100644\n--- a/Documentation/git-am.adoc\n+++ b/Documentation/git-am.adoc\n@@ -84,11 +84,10 @@ OPTIONS\n \n -m::\n --message-id::\n-\tPass the `-m` flag to linkgit:git-mailinfo[1], so that the\n-\t`Message-ID` header is added as a trailer (see\n-\tlinkgit:git-interpret-trailers[1]).  The `am.messageid`\n-\tconfiguration variable can be used to specify the default\n-\tbehaviour.\n+\tPass the `-m` flag to linkgit:git-mailinfo[1],\n+\tso that the `Message-ID` header is added to the commit message.\n+\tThe `am.messageid` configuration variable can be used to specify\n+\tthe default behaviour.\n \n --no-message-id::\n \tDo not add the Message-ID header to the commit message.\n\nbase-commit: b10e0cb1f391a4466f8d7c4b2550a8b89fda3573\n-- \n2.53.0.32.gf6228eaf9cc\n\n"}]}