Re: [PATCH 1/1] Update .mailmap

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 9, 2018, 11:29 UTC
Message-ID: <nycvar.QRO.7.76.6.1811091216490.39@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqq5zx76k67.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Fri, 9 Nov 2018, Junio C Hamano wrote:

Show 11 quoted lines

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
> 
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > This patch makes the output of `git shortlog -nse v2.10.0`
> > duplicate-free.
> 
> Did you mean "v2.10.0..master" or did you really mean this covers
> authors recorded up to v2.10.0?  Judging from the cover letter, I
> think you meant the former.

D'oh. Yes, I meant v2.10.0..master.

Show 5 quoted lines

> Can you say a bit more about how one among multiple addresses for
> each person was chosen in the log message?  E.g. "After asking each
> author which one is the preferred one", "Picked the one with the
> most recent committer timestamps", "There were two for each but one
> of them were bouncing", etc.

I looked at each of the authors' mails and tried to determine which one was the preferred one. For example, Masaya sent a patch from their gmail account but signed off using their google account, so I figured the latter was preferable. Nicolas, on the other hand, already had a couple of entries in .mailmap, so I picked the one that seemed to be preferred judging by the .mailmap even if it was not in use lately.

For Christian, it was gmail vs googlemail, and I picked the former, as it is more common these days.

For Ben and Stolee, I used their Microsoft accounts (preferring the one Ben used originally).

For Joachim, Matthieu, Randall and Tao, I used the more personalized email address.

For Orgad, I used his personal one rather than his work email.

Show 9 quoted lines

> > @@ -150,6 +155,7 @@ Mark Levedahl <mdl123@verizon.net> <mlevedahl@gmail.com>
> >  Mark Rada <marada@uwaterloo.ca>
> >  Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
> >  Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
> > +Masaya Suzuki <masayasuzuki@google.com><draftcode@gmail.com>
> 
> It is a bit surprising that we can take an entry without SP in
> between two addresses and still behave sensibley, but it probably
> makes more sense to add one just to look similar to other entries.

Whoops. Thanks, fixed!

> Thanks for working on this.

You're welcome.

v2 about to be sent, Dscho