public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
Cc: "Phillip Wood" <phillip.wood@dunelm.org.uk>,
	 "Git Mailing List" <git@vger.kernel.org>,
	 "Phillip Wood" <phillip.wood123@gmail.com>
Subject: Re: [PATCH] mailmap: add an entry for Phillip Wood
Date: Tue, 20 Jan 2026 10:26:55 -0800	[thread overview]
Message-ID: <xmqqtswgywb4.fsf@gitster.g> (raw)
In-Reply-To: <5a4e7da4-d295-4beb-9f37-b2ce4e10df35@app.fastmail.com> (Kristoffer Haugsbakk's message of "Tue, 20 Jan 2026 14:52:48 +0100")

"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"?

  reply	other threads:[~2026-01-20 18:26 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 [this message]
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

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=xmqqtswgywb4.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=kristofferhaugsbakk@fastmail.com \
    --cc=phillip.wood123@gmail.com \
    --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