Hi Johannes,
On 01/09/15 17:11, Johannes Schindelin wrote:
> 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@xxxxxxxxxx>
>> <philip.jagenstedt@xxxxxxxxx>
>> Philipp A. Hartmann <pah@xxxxx> <ph@xxxxxxxx>
>> Philippe Bruhat <book@xxxxxxxx>
>> Ralf Thielow <ralf.thielow@xxxxxxxxx> <ralf.thielow@xxxxxxxxxxxxxx>
>> -Ramsay Allan Jones <ramsay@xxxxxxxxxxxxxxxxxxx>
>> +Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> <ramsay@xxxxxxxxxxxxxxxxxxx>
>> René Scharfe <l.s.r@xxxxxx> <rene.scharfe@xxxxxxxxxxxxxx>
>> Robert Fitzsimons <robfitz@xxxxxxxx>
>> Robert Shearman <robertshearman@xxxxxxxxx> <rob@xxxxxxxxxxxxxxx>
> 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.
Hmm, I assume you are using 'git log' or 'git show' to look at these; try this:
$ git show --use-mailmap 6ebdee5af47df0c64354e452419015a694c25f5
$ git log -1 --use-mailmap f84df81f654aeb0ac4582e0b3be162cba6ea523
or indeed, this:
$ git check-mailmap "Ramsay Allan Jones <ramsay@xxxxxxxxxxxxxxxxxxx>"
Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx>
$
Also, 'git shortlog' seems to be working just fine. (The first few commits, which include
my middle name, were a mistake; back then git used to look into the GECOS field if
you didn't set your name in the config ...). [If it isn't clear, I don't want to see my middle
name!]
Yes, I was a little surprised that '--use-mailmap' was not on by default, but then I have a
very vague recollection of a discussion on the list which decided otherwise. (I'm far too
lazy to search the archives ...).
ATB,
Ramsay Jones
>
> 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!
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html