[PATCH] mailmap: add an entry for Phillip Wood

[PATCH] mailmap: add an entry for Phillip Wood

[Phillip Wood]

From: Phillip Wood <phillip.wood@dunelm.org.uk>

While all my commits appear under the same address, other addresses
appear in some commit trailers. Map those addresses to the canonical
one.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
I'm not sure if we actually remap the address in trailers but
we've certainly talked about doing it in the past.

Base-Commit: b5c409c40f1595e3e590760c6f14a16b6683e22c
Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Fpwood-mailmap%2Fv1
View-Changes-At: https://github.com/phillipwood/git/compare/b5c409c40...f10c3f680
Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/pwood-mailmap/v1

 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 3cf26b1add0..c9b50830140 100644
--- a/.mailmap
+++ b/.mailmap
@@ -226,6 +226,8 @@ Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
 Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk>
 Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
 Philippe Bruhat <book@cpan.org>
+Phillip Wood <phillip.wood@dunelm.org.uk> <phillip.wood123@gmail.com>
+Phillip Wood <phillip.wood@dunelm.org.uk> <phillip.wood@talktalk.net>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
 Ramkumar Ramachandra <r@artagnon.com> <artagnon@gmail.com>
-- 
2.52.0.362.g884e03848a9

Re: [PATCH] mailmap: add an entry for Phillip Wood

[Kristoffer Haugsbakk]

On Tue, Jan 20, 2026, at 12:01, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> While all my commits appear under the same address, other addresses
> appear in some commit trailers. Map those addresses to the canonical
> one.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> ---
> I'm not sure if we actually remap the address in trailers but
> we've certainly talked about doing it in the past.

Yeah it does.

>[snip]

Re: [PATCH] mailmap: add an entry for Phillip Wood

[Junio C Hamano]

"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:

> On Tue, Jan 20, 2026, at 12:01, Phillip Wood wrote:
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> While all my commits appear under the same address, other addresses
>> appear in some commit trailers. Map those addresses to the canonical
>> one.
>>
>> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>> ---
>> I'm not sure if we actually remap the address in trailers but
>> we've certainly talked about doing it in the past.
>
> Yeah it does.

Hmph, are you sure?  My quick experiment tells me that the trailers
are not munged.

    $ git show --pretty=fuller -s | grep '@'
    Author:     Patrick Steinhardt <ps@pks.im>
    Commit:     Junio C Hamano <gitster@pobox.com>
        Signed-off-by: Patrick Steinhardt <ps@pks.im>
        Signed-off-by: Junio C Hamano <gitster@pobox.com>
    $ cat >>.mailmap <<\EOF
    Junio C Hamano <no-such-user@google.com> <gitster@pobox.com>
    EOF
    $ git show --pretty=fuller -s | grep '@'
    Author:     Patrick Steinhardt <ps@pks.im>
    Commit:     Junio C Hamano <no-such-user@google.com>
        Signed-off-by: Patrick Steinhardt <ps@pks.im>
        Signed-off-by: Junio C Hamano <gitster@pobox.com>

By the way, this is totally expected as there is no guarantee that
what comes after these colons would look like a human-readable-name
followed by an e-mail address at all.  Some projects deliberately
omit e-mail addresses from reporter credits to protect themselves in
jurisdiction with stronger privacy laws, some trailers like
"closes:" do not even point at people, etc.

Or perhaps your "Yeah" is about "we've talkined about doing it"?

Re: [PATCH] mailmap: add an entry for Phillip Wood

[Kristoffer Haugsbakk]

On Tue, Jan 20, 2026, at 19:26, Junio C Hamano wrote:
>>>[snip]
>>> I'm not sure if we actually remap the address in trailers but
>>> we've certainly talked about doing it in the past.
>>
>> Yeah it does.
>
> Hmph, are you sure?  My quick experiment tells me that the trailers
> are not munged.

I was working on state that it turns out was not in the email thread.
I jumped to the conclusion that the question was about git-shortlog(1)
using the mailmap. Since that is the only place where I know that
trailers can be mapped like that.

I call it the curse of invented knowledge ;) sorry.

>[snip]

Re: [PATCH] mailmap: add an entry for Phillip Wood

[Jeff King]

On Tue, Jan 20, 2026 at 10:26:55AM -0800, Junio C Hamano wrote:

> "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:
> 
> > On Tue, Jan 20, 2026, at 12:01, Phillip Wood wrote:
> >> From: Phillip Wood <phillip.wood@dunelm.org.uk>
> >>
> >> While all my commits appear under the same address, other addresses
> >> appear in some commit trailers. Map those addresses to the canonical
> >> one.
> >>
> >> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> >> ---
> >> I'm not sure if we actually remap the address in trailers but
> >> we've certainly talked about doing it in the past.
> >
> > Yeah it does.
> 
> Hmph, are you sure?  My quick experiment tells me that the trailers
> are not munged.
> 
>     $ git show --pretty=fuller -s | grep '@'
>     Author:     Patrick Steinhardt <ps@pks.im>
>     Commit:     Junio C Hamano <gitster@pobox.com>
>         Signed-off-by: Patrick Steinhardt <ps@pks.im>
>         Signed-off-by: Junio C Hamano <gitster@pobox.com>
>     $ cat >>.mailmap <<\EOF
>     Junio C Hamano <no-such-user@google.com> <gitster@pobox.com>
>     EOF
>     $ git show --pretty=fuller -s | grep '@'
>     Author:     Patrick Steinhardt <ps@pks.im>
>     Commit:     Junio C Hamano <no-such-user@google.com>
>         Signed-off-by: Patrick Steinhardt <ps@pks.im>
>         Signed-off-by: Junio C Hamano <gitster@pobox.com>

We do apply them in some places, like shortlog:

  $ cat >>.mailmap <<\EOF
  Junio C Hamano <no-such-user@google.com> <gitster@pobox.com>
  EOF
  $ git shortlog -1 -ne --group=trailer:signed-off-by 3f051fc9
  Junio C Hamano <no-such-user@google.com> (1):
        doc: patch-id: --verbatim locks in --stable
  
  Kristoffer Haugsbakk <code@khaugsbakk.name> (1):
        doc: patch-id: --verbatim locks in --stable

As you noted, we don't necessarily know that a given trailer represents
an ident. But we try to parse them as one (not just for mailmap, but for
stuff like "-e"), and if that doesn't work leave it as an opaque string.
That all comes from 56d5dde752 (shortlog: parse trailer idents,
2020-09-27).

I _thought_ we added support for %(trailers) to handle mailmap, too,
but...

> Or perhaps your "Yeah" is about "we've talkined about doing it"?

...yeah, I think this is the case. There's a proof of concept at:

  https://lore.kernel.org/git/YW8A5FznqLYs7MqH@coredump.intra.peff.net/

but nobody ever took it further (I do still run with it as part of my
daily build, which probably enhanced my confusion ;) ).

-Peff

Re: [PATCH] mailmap: add an entry for Phillip Wood

[Kristoffer Haugsbakk]

On Tue, Jan 20, 2026, at 20:24, Jeff King wrote:
>>[snipe]
>> Or perhaps your "Yeah" is about "we've talkined about doing it"?
>
> ...yeah, I think this is the case. There's a proof of concept at:
>
>   https://lore.kernel.org/git/YW8A5FznqLYs7MqH@coredump.intra.peff.net/
>
> but nobody ever took it further

I have been thinking lately of a `.trailersmap` which has the hash on
one line and the trailers beneath for each entry. Because some trailer
blocks are unintentionally mangled.

> (I do still run with it as part of my daily build, which probably
> enhanced my confusion ;) ).

Cool!

Re: [PATCH] mailmap: add an entry for Phillip Wood

[Phillip Wood]

On 20/01/2026 19:24, Jeff King wrote:
> On Tue, Jan 20, 2026 at 10:26:55AM -0800, Junio C Hamano wrote:
> 
> We do apply them in some places, like shortlog:
> 
>    $ cat >>.mailmap <<\EOF
>    Junio C Hamano <no-such-user@google.com> <gitster@pobox.com>
>    EOF
>    $ git shortlog -1 -ne --group=trailer:signed-off-by 3f051fc9
>    Junio C Hamano <no-such-user@google.com> (1):
>          doc: patch-id: --verbatim locks in --stable
>    
>    Kristoffer Haugsbakk <code@khaugsbakk.name> (1):
>          doc: patch-id: --verbatim locks in --stable
> 
> As you noted, we don't necessarily know that a given trailer represents
> an ident. But we try to parse them as one (not just for mailmap, but for
> stuff like "-e"), and if that doesn't work leave it as an opaque string.
> That all comes from 56d5dde752 (shortlog: parse trailer idents,
> 2020-09-27).

Ah so the mailmap entries I'm adding do have some limited use, but they 
don't work for git log.

> I _thought_ we added support for %(trailers) to handle mailmap, too,
> but...
> 
>> Or perhaps your "Yeah" is about "we've talkined about doing it"?
> 
> ...yeah, I think this is the case. There's a proof of concept at:
> 
>    https://lore.kernel.org/git/YW8A5FznqLYs7MqH@coredump.intra.peff.net/

Thanks for the link, I thought we'd discussed it at one of the 
contributor summits but I couldn't remember if anything had come of it.

Phillip

> but nobody ever took it further (I do still run with it as part of my
> daily build, which probably enhanced my confusion ;) ).
> 
> -Peff
>