Re: [PATCH 3/3] .mailmap: map names with multiple emails to the same author identity

From: Stefan Beller <sbeller@google.com>
Date: Jun 29, 2018, 18:38 UTC
Message-ID: <CAGZ79kbG29SbsR=+7qwM+++Jk+G2AWYswQY1tYJy2KMSCKr8FQ@mail.gmail.com>
In-Reply-To: <xmqqh8llv690.fsf@gitster-ct.c.googlers.com>

On Fri, Jun 29, 2018 at 10:42 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 14 quoted lines

>
> Stefan Beller <sbeller@google.com> writes:
>
> > There are multiple author idents who have different email addresses, but
> > the same name; assume they are the same person, as the world of open source
> > is actually rather small.
>
> Thanks for an interesting experiment.  As with 2/3, I suspect that
> most of the contents in the patch may be correct, but I'd rather see
> these confirmed by those whose names appear in the patch.
>
> IOW, I would not feel comfortable applying a patch, unless it looks
> like this (just taking a single person as a random example),
> and I do not mind many such individual patches:

right, I did not quite expect this patch to be applied, though it looked like such a sweet shortcut.

I might just email all of them and ask for them to update their .mailmap entries.

Thanks, Stefan

>     Subject: .mailmap: unify the same Ben Peart

cc'd Ben, so we could start here with a patch. :)

Show 22 quoted lines

>     These multiple author identities in our history are actually the
>     same person.  Map them to the latest address.
>
>     Signed-off-by: Stefan Beller <sbeller@google.com>
>     Acked-by: Ben Peart <Ben.Peart@microsoft.com>
>     ---
>
>     diff --git a/.mailmap b/.mailmap
>     index ff96ef7401f..2607846582a 100644
>     --- a/.mailmap
>     +++ b/.mailmap
>     @@ -5,54 +5,86 @@
>      Amos Waterland <apw@debian.org> <apw@us.ibm.com>
>      Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
>      Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
>     +Ben Peart <Ben.Peart@microsoft.com> Ben Peart <benpeart@microsoft.com>
>     +Ben Peart <Ben.Peart@microsoft.com> Ben Peart <peartben@gmail.com>
>      Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
>      Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
>
> It may be even better if we can arraange the author of the patch to
> be the one who is involved, with "Helped-by: Stefan".

ok, I'll think how I can help but not write the code.

Thanks, Stefan