Re: [PATCH] mailmap: update my entry with new email address
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 1, 2015, 16:11 UTC
- Message-ID
- <01dbb6005800a8816a5f6b9ae740dbc9@www.dscho.org>
- In-Reply-To
- <55E5C92E.7040105@ramsayjones.plus.com>
Hi Ramsay,
On 2015-09-01 17:50, Ramsay Jones wrote:
Show 14 quoted lines
> 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.
Therefore I would recommend leaving the old line in place, and just *adding* another one.
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 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!