{"thread":{"id":"64835","subject":"[PATCH] mailmap: add an entry for Phillip Wood","startedAt":"2026-01-20T11:02:12Z","lastAt":"2026-01-21T10:43:56Z","messageCount":7,"participants":["Phillip Wood","Kristoffer Haugsbakk","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"534229","messageId":"f10c3f680d58ca0abbf795ae8b0f2ad14ab85419.1768906910.git.phillip.wood@dunelm.org.uk","threadId":"64835","inReplyTo":null,"subject":"[PATCH] mailmap: add an entry for Phillip Wood","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-01-20T11:01:55Z","receivedAt":"2026-01-20T11:02:12Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood \n\nWhile all my commits appear under the same address, other addresses\nappear in some commit trailers. Map those addresses to the canonical\none.\n\nSigned-off-by: Phillip Wood \n---\nI'm not sure if we actually remap the address in trailers but\nwe've certainly talked about doing it in the past.\n\nBase-Commit: b5c409c40f1595e3e590760c6f14a16b6683e22c\nPublished-As: https://github.com/phillipwood/git/releases/tag/pw%2Fpwood-mailmap%2Fv1\nView-Changes-At: https://github.com/phillipwood/git/compare/b5c409c40...f10c3f680\nFetch-It-Via: git fetch https://github.com/phillipwood/git pw/pwood-mailmap/v1\n\n .mailmap | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/.mailmap b/.mailmap\nindex 3cf26b1add0..c9b50830140 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -226,6 +226,8 @@ Philip Jägenstedt \n Philip Oakley # secondary \n Philipp A. Hartmann \n Philippe Bruhat \n+Phillip Wood \n+Phillip Wood \n Ralf Thielow \n Ramsay Jones \n Ramkumar Ramachandra \n-- \n2.52.0.362.g884e03848a9\n\n"},{"id":"534233","messageId":"5a4e7da4-d295-4beb-9f37-b2ce4e10df35@app.fastmail.com","threadId":"64835","inReplyTo":"f10c3f680d58ca0abbf795ae8b0f2ad14ab85419.1768906910.git.phillip.wood@dunelm.org.uk","subject":"Re: [PATCH] mailmap: add an entry for Phillip Wood","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-01-20T13:52:48Z","receivedAt":"2026-01-20T13:53:10Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Tue, Jan 20, 2026, at 12:01, Phillip Wood wrote:\n> From: Phillip Wood \n>\n> While all my commits appear under the same address, other addresses\n> appear in some commit trailers. Map those addresses to the canonical\n> one.\n>\n> Signed-off-by: Phillip Wood \n> ---\n> I'm not sure if we actually remap the address in trailers but\n> we've certainly talked about doing it in the past.\n\nYeah it does.\n\n>[snip]\n"},{"id":"534276","messageId":"xmqqtswgywb4.fsf@gitster.g","threadId":"64835","inReplyTo":"5a4e7da4-d295-4beb-9f37-b2ce4e10df35@app.fastmail.com","subject":"Re: [PATCH] mailmap: add an entry for Phillip Wood","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-01-20T18:26:55Z","receivedAt":"2026-01-20T18:26:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Kristoffer Haugsbakk\" writes:\n\n> On Tue, Jan 20, 2026, at 12:01, Phillip Wood wrote:\n>> From: Phillip Wood \n>>\n>> While all my commits appear under the same address, other addresses\n>> appear in some commit trailers. Map those addresses to the canonical\n>> one.\n>>\n>> Signed-off-by: Phillip Wood \n>> ---\n>> I'm not sure if we actually remap the address in trailers but\n>> we've certainly talked about doing it in the past.\n>\n> Yeah it does.\n\nHmph, are you sure? My quick experiment tells me that the trailers\nare not munged.\n\n $ git show --pretty=fuller -s | grep '@'\n Author: Patrick Steinhardt \n Commit: Junio C Hamano \n Signed-off-by: Patrick Steinhardt \n Signed-off-by: Junio C Hamano \n $ cat >>.mailmap <<\\EOF\n Junio C Hamano \n EOF\n $ git show --pretty=fuller -s | grep '@'\n Author: Patrick Steinhardt \n Commit: Junio C Hamano \n Signed-off-by: Patrick Steinhardt \n Signed-off-by: Junio C Hamano \n\nBy the way, this is totally expected as there is no guarantee that\nwhat comes after these colons would look like a human-readable-name\nfollowed by an e-mail address at all. Some projects deliberately\nomit e-mail addresses from reporter credits to protect themselves in\njurisdiction with stronger privacy laws, some trailers like\n\"closes:\" do not even point at people, etc.\n\nOr perhaps your \"Yeah\" is about \"we've talkined about doing it\"?\n"},{"id":"534278","messageId":"291a02b3-54b2-4444-bebf-7d7a9265f11a@app.fastmail.com","threadId":"64835","inReplyTo":"xmqqtswgywb4.fsf@gitster.g","subject":"Re: [PATCH] mailmap: add an entry for Phillip Wood","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-01-20T18:48:56Z","receivedAt":"2026-01-20T18:49:17Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Tue, Jan 20, 2026, at 19:26, Junio C Hamano wrote:\n>>>[snip]\n>>> I'm not sure if we actually remap the address in trailers but\n>>> we've certainly talked about doing it in the past.\n>>\n>> Yeah it does.\n>\n> Hmph, are you sure? My quick experiment tells me that the trailers\n> are not munged.\n\nI was working on state that it turns out was not in the email thread.\nI jumped to the conclusion that the question was about git-shortlog(1)\nusing the mailmap. Since that is the only place where I know that\ntrailers can be mapped like that.\n\nI call it the curse of invented knowledge ;) sorry.\n\n>[snip]\n"},{"id":"534279","messageId":"20260120192424.GA3295894@coredump.intra.peff.net","threadId":"64835","inReplyTo":"xmqqtswgywb4.fsf@gitster.g","subject":"Re: [PATCH] mailmap: add an entry for Phillip Wood","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2026-01-20T19:24:24Z","receivedAt":"2026-01-20T19:24:32Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Jan 20, 2026 at 10:26:55AM -0800, Junio C Hamano wrote:\n\n> \"Kristoffer Haugsbakk\" writes:\n> \n> > On Tue, Jan 20, 2026, at 12:01, Phillip Wood wrote:\n> >> From: Phillip Wood \n> >>\n> >> While all my commits appear under the same address, other addresses\n> >> appear in some commit trailers. Map those addresses to the canonical\n> >> one.\n> >>\n> >> Signed-off-by: Phillip Wood \n> >> ---\n> >> I'm not sure if we actually remap the address in trailers but\n> >> we've certainly talked about doing it in the past.\n> >\n> > Yeah it does.\n> \n> Hmph, are you sure? My quick experiment tells me that the trailers\n> are not munged.\n> \n> $ git show --pretty=fuller -s | grep '@'\n> Author: Patrick Steinhardt \n> Commit: Junio C Hamano \n> Signed-off-by: Patrick Steinhardt \n> Signed-off-by: Junio C Hamano \n> $ cat >>.mailmap <<\\EOF\n> Junio C Hamano \n> EOF\n> $ git show --pretty=fuller -s | grep '@'\n> Author: Patrick Steinhardt \n> Commit: Junio C Hamano \n> Signed-off-by: Patrick Steinhardt \n> Signed-off-by: Junio C Hamano \n\nWe do apply them in some places, like shortlog:\n\n $ cat >>.mailmap <<\\EOF\n Junio C Hamano \n EOF\n $ git shortlog -1 -ne --group=trailer:signed-off-by 3f051fc9\n Junio C Hamano (1):\n doc: patch-id: --verbatim locks in --stable\n \n Kristoffer Haugsbakk (1):\n doc: patch-id: --verbatim locks in --stable\n\nAs you noted, we don't necessarily know that a given trailer represents\nan ident. But we try to parse them as one (not just for mailmap, but for\nstuff like \"-e\"), and if that doesn't work leave it as an opaque string.\nThat all comes from 56d5dde752 (shortlog: parse trailer idents,\n2020-09-27).\n\nI _thought_ we added support for %(trailers) to handle mailmap, too,\nbut...\n\n> Or perhaps your \"Yeah\" is about \"we've talkined about doing it\"?\n\n...yeah, I think this is the case. There's a proof of concept at:\n\n https://lore.kernel.org/git/YW8A5FznqLYs7MqH@coredump.intra.peff.net/\n\nbut nobody ever took it further (I do still run with it as part of my\ndaily build, which probably enhanced my confusion ;) ).\n\n-Peff\n"},{"id":"534312","messageId":"8712ff01-aed1-4f74-9c8b-b36bc22eb56d@app.fastmail.com","threadId":"64835","inReplyTo":"20260120192424.GA3295894@coredump.intra.peff.net","subject":"Re: [PATCH] mailmap: add an entry for Phillip Wood","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-01-21T05:59:04Z","receivedAt":"2026-01-21T05:59:27Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Tue, Jan 20, 2026, at 20:24, Jeff King wrote:\n>>[snipe]\n>> Or perhaps your \"Yeah\" is about \"we've talkined about doing it\"?\n>\n> ...yeah, I think this is the case. There's a proof of concept at:\n>\n> https://lore.kernel.org/git/YW8A5FznqLYs7MqH@coredump.intra.peff.net/\n>\n> but nobody ever took it further\n\nI have been thinking lately of a `.trailersmap` which has the hash on\none line and the trailers beneath for each entry. Because some trailer\nblocks are unintentionally mangled.\n\n> (I do still run with it as part of my daily build, which probably\n> enhanced my confusion ;) ).\n\nCool!\n"},{"id":"534328","messageId":"e259aa7f-9290-4305-af92-88be6ab08a1b@gmail.com","threadId":"64835","inReplyTo":"20260120192424.GA3295894@coredump.intra.peff.net","subject":"Re: [PATCH] mailmap: add an entry for Phillip Wood","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-01-21T10:43:53Z","receivedAt":"2026-01-21T10:43:56Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 20/01/2026 19:24, Jeff King wrote:\n> On Tue, Jan 20, 2026 at 10:26:55AM -0800, Junio C Hamano wrote:\n> \n> We do apply them in some places, like shortlog:\n> \n> $ cat >>.mailmap <<\\EOF\n> Junio C Hamano \n> EOF\n> $ git shortlog -1 -ne --group=trailer:signed-off-by 3f051fc9\n> Junio C Hamano (1):\n> doc: patch-id: --verbatim locks in --stable\n> \n> Kristoffer Haugsbakk (1):\n> doc: patch-id: --verbatim locks in --stable\n> \n> As you noted, we don't necessarily know that a given trailer represents\n> an ident. But we try to parse them as one (not just for mailmap, but for\n> stuff like \"-e\"), and if that doesn't work leave it as an opaque string.\n> That all comes from 56d5dde752 (shortlog: parse trailer idents,\n> 2020-09-27).\n\nAh so the mailmap entries I'm adding do have some limited use, but they \ndon't work for git log.\n\n> I _thought_ we added support for %(trailers) to handle mailmap, too,\n> but...\n> \n>> Or perhaps your \"Yeah\" is about \"we've talkined about doing it\"?\n> \n> ...yeah, I think this is the case. There's a proof of concept at:\n> \n> https://lore.kernel.org/git/YW8A5FznqLYs7MqH@coredump.intra.peff.net/\n\nThanks for the link, I thought we'd discussed it at one of the \ncontributor summits but I couldn't remember if anything had come of it.\n\nPhillip\n\n> but nobody ever took it further (I do still run with it as part of my\n> daily build, which probably enhanced my confusion ;) ).\n> \n> -Peff\n> \n\n"}]}