From: Phillip Wood <phillip.wood123@gmail.com>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] mailmap: add an entry for Phillip Wood
Date: Wed, 21 Jan 2026 10:43:53 +0000 [thread overview]
Message-ID: <e259aa7f-9290-4305-af92-88be6ab08a1b@gmail.com> (raw)
In-Reply-To: <20260120192424.GA3295894@coredump.intra.peff.net>
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
>
prev parent reply other threads:[~2026-01-21 10:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 11:01 [PATCH] mailmap: add an entry for Phillip Wood Phillip Wood
2026-01-20 13:52 ` Kristoffer Haugsbakk
2026-01-20 18:26 ` Junio C Hamano
2026-01-20 18:48 ` Kristoffer Haugsbakk
2026-01-20 19:24 ` Jeff King
2026-01-21 5:59 ` Kristoffer Haugsbakk
2026-01-21 10:43 ` Phillip Wood [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e259aa7f-9290-4305-af92-88be6ab08a1b@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox