Re: [PATCH] mailmap: update my entry with new email address
On Tue, Sep 1, 2015 at 9:11 AM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
Show 20 quoted lines
> Hi Ramsay,
>
> On 2015-09-01 17:50, Ramsay Jones wrote:
>
>> diff --git a/.mailmap b/.mailmap
>> index ece2951..e5b4126 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -186,7 +186,7 @@ Philip Jägenstedt <philip@foolip.org>
>> <philip.jagenstedt@gmail.com>
>> Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
>> Philippe Bruhat <book@cpan.org>
>> Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
>> -Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
>> +Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
>> René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
>> Robert Fitzsimons <robfitz@273k.net>
>> Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
>
> The idea of the .mailmap file is to fix inconsistent names in the history. For example, if you look e.g. at commit 6ebdee5af47df0c64354e452419015a694c25f5f, you will see that your middle name was recorded, but if you look e.g. at f84df81f654aeb0ac4582e0b3be162cba6ea5232 you will see that it was not always recorded with your changes.
I would argue a mailmap file serves a dual purpose. The first purpose as you said is to correct inconsistent or erroneous names (who is sb@local.host anyway ?)
The second purpose is just as Ramsay used it to map different identities to one person/email address. As Ramsay lost his access to the email, you would want to use his new email, say when looking for the right reviewer using git blame. Then even old commits (with the old email recorded) should rather display the new email, such that you get it right the first time.
>
> Therefore I would recommend leaving the old line in place, and just *adding* another one.
I would recommending taking this patch specifically for the second purpose.
>
> Besides, for consistency I would leave the middle name in there. Otherwise, people might be wondering why their shortlog calls bring up some other name. In other words, if you add a new line, you really want to use the same clear name as before.
You can use the long form
Name1 <email2> Name2 <email2>
in the .mailmap file to always show the Name1 and email1.
Show 7 quoted lines
>
> You actually do not even need to add a new line if you plan on submitting patches with your middle name. Remember: the main purpose of .mailmap is to support shortlog, i.e. appropriate grouping of patches by person (such as the two commits I mentioned above).
>
> Ciao,
> Johannes
>
> P.S.: That's a major bummer on your three forced-offline weeks. I feel with ya!
Sometimes I'd love to be offline for 3 weeks. But being forced to? No thanks!
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Ramsay Jones
