{"thread":{"id":"65968","subject":"[PATCH] b4: include change-id in cover template","startedAt":"2026-07-10T07:22:25Z","lastAt":"2026-07-10T17:02:31Z","messageCount":3,"participants":["Chen Linxuan via B4 Relay","Patrick Steinhardt","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"547685","messageId":"20260710-add-change-id-to-b4-template-v1-1-1bd37a25064e@black-desk.cn","threadId":"65968","inReplyTo":null,"subject":"[PATCH] b4: include change-id in cover template","fromName":"Chen Linxuan via B4 Relay","fromEmail":"devnull+me.black-desk.cn@kernel.org","sentAt":"2026-07-10T07:22:13Z","receivedAt":"2026-07-10T07:22:25Z","isPatch":true,"body":"From: Chen Linxuan <me@black-desk.cn>\n\nWith b4 0.15.2, I hit a local failure after sending a series with the\nin-tree cover template.  The generated sent/<change-id>-vN tag contained\nbase-commit, but did not contain change-id, and later b4 commands failed\nwhen trying to read it:\n\n  CRITICAL: Tag sent/... does not contain change-id info\n\nLooking at b4's source, the sent tag message is derived from the rendered\ncover letter.  The same code later parses that tag and expects both\nbase-commit and change-id to be present.  The default b4 cover template\nhas both trailers, but our in-tree template only has base-commit.\n\nAdd the missing change-id trailer next to base-commit so sent tags\nproduced from the project template remain readable by b4's reroll and\ncomparison logic.\n\nSigned-off-by: Chen Linxuan <me@black-desk.cn>\n---\n .b4-cover-template | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/.b4-cover-template b/.b4-cover-template\nindex ab864933b5c8..8168d8a10b3a 100644\n--- a/.b4-cover-template\n+++ b/.b4-cover-template\n@@ -8,4 +8,5 @@ ${diffstat}\n ${range_diff}\n ---\n base-commit: ${base_commit}\n+change-id: ${change_id}\n ${prerequisites}\n\n---\nbase-commit: f60db8d575adb79761d363e026fb49bddf330c73\nchange-id: 20260710-add-change-id-to-b4-template-f9fd20937027\n\n\n"},{"id":"547687","messageId":"alCxgqybWb9eDEG0@pks.im","threadId":"65968","inReplyTo":"20260710-add-change-id-to-b4-template-v1-1-1bd37a25064e@black-desk.cn","subject":"Re: [PATCH] b4: include change-id in cover template","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-07-10T08:46:58Z","receivedAt":"2026-07-10T08:47:05Z","isPatch":true,"body":"On Fri, Jul 10, 2026 at 03:22:13PM +0800, Chen Linxuan via B4 Relay wrote:\n> From: Chen Linxuan <me@black-desk.cn>\n> \n> With b4 0.15.2, I hit a local failure after sending a series with the\n> in-tree cover template.  The generated sent/<change-id>-vN tag contained\n> base-commit, but did not contain change-id, and later b4 commands failed\n> when trying to read it:\n> \n>   CRITICAL: Tag sent/... does not contain change-id info\n> \n> Looking at b4's source, the sent tag message is derived from the rendered\n> cover letter.  The same code later parses that tag and expects both\n> base-commit and change-id to be present.  The default b4 cover template\n> has both trailers, but our in-tree template only has base-commit.\n> \n> Add the missing change-id trailer next to base-commit so sent tags\n> produced from the project template remain readable by b4's reroll and\n> comparison logic.\n\nAh, that's indeed an oversight on my side. So this change looks good to\nme, thanks!\n\nPatrick\n"},{"id":"547779","messageId":"xmqqik6mdbh6.fsf@gitster.g","threadId":"65968","inReplyTo":"alCxgqybWb9eDEG0@pks.im","subject":"Re: [PATCH] b4: include change-id in cover template","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-07-10T17:02:29Z","receivedAt":"2026-07-10T17:02:31Z","isPatch":true,"body":"Patrick Steinhardt <ps@pks.im> writes:\n\n> On Fri, Jul 10, 2026 at 03:22:13PM +0800, Chen Linxuan via B4 Relay wrote:\n>> From: Chen Linxuan <me@black-desk.cn>\n>> \n>> With b4 0.15.2, I hit a local failure after sending a series with the\n>> in-tree cover template.  The generated sent/<change-id>-vN tag contained\n>> base-commit, but did not contain change-id, and later b4 commands failed\n>> when trying to read it:\n>> \n>>   CRITICAL: Tag sent/... does not contain change-id info\n>> \n>> Looking at b4's source, the sent tag message is derived from the rendered\n>> cover letter.  The same code later parses that tag and expects both\n>> base-commit and change-id to be present.  The default b4 cover template\n>> has both trailers, but our in-tree template only has base-commit.\n>> \n>> Add the missing change-id trailer next to base-commit so sent tags\n>> produced from the project template remain readable by b4's reroll and\n>> comparison logic.\n>\n> Ah, that's indeed an oversight on my side. So this change looks good to\n> me, thanks!\n>\n> Patrick\n\nI would have slightly preferred to see the observation part fully in\npresent tense (instead of \"I did and it failed\"), perhaps like so:\n\n    When sending a series with the in-tree cover template, the\n    generated sent/<change-id>-vN tag contains base-commit but lacks\n    change-id.  Later b4 commands fail when trying to read it.\n\nbut that is a minor point.\n\nWill queue.  Thanks, both.\n"}]}