[Mesa-dev] [PATCH] Add .mailmap

Giuseppe Bilotta giuseppe.bilotta at gmail.com
Tue Dec 15 23:04:49 PST 2015


On Wed, Dec 16, 2015 at 3:18 AM, Michel Dänzer <michel at daenzer.net> wrote:
> On 16.12.2015 06:40, Giuseppe Bilotta wrote:
>> +
>> +Adam Jackson <ajax at freedesktop.org> <ajax at benzedrine.nwnk.net>
>> +Adam Jackson <ajax at freedesktop.org> <ajax at redhat.com>
>
> In Adam's case, you put a personal e-mail address first and his
> employer's address last.

D'oh, sorry, failed to check which was the one used in the last
commits. I'm going to fix this, unless Adam actually prefers the
current way the mapping is done.

>> +Michel Dänzer <michel.daenzer at amd.com> Michel Daenzer <michel.daenzer at amd.com>
>> +Michel Dänzer <michel.daenzer at amd.com> Michel Daenzer <daenzer at localhost.(none)>
>> +Michel Dänzer <michel.daenzer at amd.com> <daenzer at vmware.com>
>> +Michel Dänzer <michel.daenzer at amd.com> <michel at daenzer.net>
>> +Michel Dänzer <michel.daenzer at amd.com> <michel at tungstengraphics.com>
>
> In my case, you put my current employer's address first and my personal
> and former employers' addresses last.

The general pattern I've tried to follow in case of multiple email
addresses has been to map everything to the most recent one, but in no
particular order (the order is irrelevant). Apparently in some cases
(such as Adam's) I messed up. :-)

> What's the (intended) meaning of this mapping? If it means that all my
> contributions will be accounted to AMD, I'm afraid that's not very accurate.

The mailmap intended purpose is to avoid having the same person appear
multiple times in the output of things such as `git shortlog -s -n`.
It doesn't specifically credit contributions to one's employer at a
specific time. For _that_ kind of information, one would rather use
something like `git dm`, for which you can add more sophisticated
metadata about mapping users to companies over time, such as the one
Kenneth shared with us:
http://cgit.freedesktop.org/~kwg/mesa/commit/?h=gitdm


-- 
Giuseppe "Oblomov" Bilotta


More information about the mesa-dev mailing list