[PATCH] Update .mailmap.

[PATCH] Update .mailmap.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

As can be seen with "git --no-pager shortlog -nse", we have several
duplicates.  The attached patch should fix those.  I'm Cc-ing this
message to people whose names/emails are touched, so you can check
whether the proper ones are used.


[-- Attachment #2: 0001-Update-.mailmap.patch --]
[-- Type: text/x-patch, Size: 2707 bytes --]

From 270faa924e54297df8a04301bcedabb6c6de1b2f Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Thu, 17 Mar 2016 13:49:28 +0300
Subject: [PATCH] Update .mailmap.

* .mailmap: Add new entries for Al McElrath, Andreas Enge, Ben
  Woodcroft, David Thompson, Leo Famulari, Mathieu Lirzin, Nils
  Gillmann, Raimon Grau.
---
 .mailmap | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index a5fa857..563320b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,14 +1,19 @@
 # This list is used to avoid multiple name/email instances of the same
 # contributors reported by "git log" and "git shortlog" commands.
 
+Al McElrath <hello@yrns.org> <hello@atonesir.com>
 Alexander I. Grafov <grafov@gmail.com>
 Amirouche Boubekki <amirouche@hypermove.net>
+Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
+Andreas Enge <andreas@enge.fr> <privat@xobs-novena>
 Andy Wingo <wingo@igalia.com> <wingo@pobox.com>
-Ben Woodcroft <b.woodcroft@uq.edu.au> <donttrustben@gmail.com>
+Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au>
+Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com>
 Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
 Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com>
 David Thompson <davet@gnu.org> <dthompson2@worcester.edu>
 David Thompson <davet@gnu.org> <dthompson@member.fsf.org>
+David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com>
 Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple>
 Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com>
 Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com>
@@ -17,11 +22,15 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
 Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
 Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
 Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
+Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
 Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
-Mathieu Lirzin <mthl@openmailbox.org> <mathieu.lirzin@openmailbox.org>
+Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
+Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
+Nils Gillmann <niasterisk@grrlz.net> <ng@niasterisk.space>
 Pjotr Prins <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
+Raimon Grau <raimonster@gmail.com> <raimon@3scale.net>
 Ricardo Wurmus <rekado@elephly.net>
 Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de>
 Sou Bunnbu (宋文武) <iyzsong@gmail.com>
-- 
2.6.3


[-- Attachment #3: Type: text/plain, Size: 27 bytes --]


-- 
Alex is watching you!

Re: [PATCH] Update .mailmap.

[Andreas Enge]

On Thu, Mar 17, 2016 at 02:09:27PM +0300, Alex Kost wrote:
> As can be seen with "git --no-pager shortlog -nse", we have several
> duplicates.  The attached patch should fix those.  I'm Cc-ing this
> message to people whose names/emails are touched, so you can check
> whether the proper ones are used.

We cannot rewrite history on master, right? My duplicates
+Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
+Andreas Enge <andreas@enge.fr> <privat@xobs-novena>
are clearly just errors when setting up a new git checkout.
Otherwise I think it is good to unify.

Andreas

Re: [PATCH] Update .mailmap.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> As can be seen with "git --no-pager shortlog -nse", we have several
> duplicates.  The attached patch should fix those.  I'm Cc-ing this
> message to people whose names/emails are touched, so you can check
> whether the proper ones are used.

I think you can wait for a couple of days and commit if there are no
objections.

Thanks,
Ludo’.

Re: [PATCH] Update .mailmap.

[Mathieu Lirzin]

Alex Kost <alezost@gmail.com> writes:

> As can be seen with "git --no-pager shortlog -nse", we have several
> duplicates.  The attached patch should fix those.  I'm Cc-ing this
> message to people whose names/emails are touched, so you can check
> whether the proper ones are used.

It is OK for me.

Thanks for taking care of this.

-- 
Mathieu Lirzin

Re: [PATCH] Update .mailmap.

[Alex Kost]

Andreas Enge (2016-03-17 16:04 +0300) wrote:

> On Thu, Mar 17, 2016 at 02:09:27PM +0300, Alex Kost wrote:
>> As can be seen with "git --no-pager shortlog -nse", we have several
>> duplicates.  The attached patch should fix those.  I'm Cc-ing this
>> message to people whose names/emails are touched, so you can check
>> whether the proper ones are used.
>
> We cannot rewrite history on master, right? My duplicates
> +Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
> +Andreas Enge <andreas@enge.fr> <privat@xobs-novena>
> are clearly just errors when setting up a new git checkout.
> Otherwise I think it is good to unify.

I'm not going to rewrite history.  The purpose of keeping a proper
.mailmap is to have a "good" AUTHORS file (without duplicates) which is
generated using "git shortlog" (see "build-aux/generate-authors.scm").

-- 
Alex

Re: [PATCH] Update .mailmap.

[Nils Gillmann]

It's okay for me.

I think .mailmap is only for mail, so my old contribution name
will only be fixed once someone applies the gnunet.scm patch and
others where it might still occur.
-- 
ng
personal contact: http://krosos.sdf.org
EDN: https://wiki.c3d2.de/EDN

Re: [PATCH] Update .mailmap.

[Alex Kost]

Nils Gillmann (2016-03-20 15:17 +0300) wrote:

> It's okay for me.
>
> I think .mailmap is only for mail, so my old contribution name
> will only be fixed once someone applies the gnunet.scm patch and
> others where it might still occur.

You will fix your name in gnunet.scm some day¹, right?  If you are not
going to modify gnunet.scm, we can fix it right now.

.mailmap is not for mail.  It is used by "git shortlog" (see "man
git-shortlog"), and as I wrote, we use this output to generate AUTHORS
file in a release tarball, so keeping this output clean is important.

¹ http://lists.gnu.org/archive/html/guix-devel/2016-02/msg00506.html

-- 
Alex

Re: [PATCH] Update .mailmap.

[Nils Gillmann]

Alex Kost <alezost@gmail.com> writes:

> Nils Gillmann (2016-03-20 15:17 +0300) wrote:
>
>> It's okay for me.
>>
>> I think .mailmap is only for mail, so my old contribution name
>> will only be fixed once someone applies the gnunet.scm patch and
>> others where it might still occur.
>
> You will fix your name in gnunet.scm some day¹, right?  If you are not
> going to modify gnunet.scm, we can fix it right now.

Yes, see also the pending to be retested or whatever by someone
with commit access patch for the gnunet.scm, thread here:
http://lists.gnu.org/archive/html/guix-devel/2016-03/msg00464.html

> .mailmap is not for mail.  It is used by "git shortlog" (see "man
> git-shortlog"), and as I wrote, we use this output to generate AUTHORS
> file in a release tarball, so keeping this output clean is
> important.

I understood that, my reply was a bit too short to transport that
I did so.

>
> ¹ http://lists.gnu.org/archive/html/guix-devel/2016-02/msg00506.html


-- 
ng
personal contact: http://krosos.sdf.org
EDN: https://wiki.c3d2.de/EDN

Re: [PATCH] Update .mailmap.

[Alex Kost]

Nils Gillmann (2016-03-21 15:46 +0300) wrote:

> Alex Kost <alezost@gmail.com> writes:
>
>> Nils Gillmann (2016-03-20 15:17 +0300) wrote:
>>
>>> It's okay for me.
>>>
>>> I think .mailmap is only for mail, so my old contribution name
>>> will only be fixed once someone applies the gnunet.scm patch and
>>> others where it might still occur.
>>
>> You will fix your name in gnunet.scm some day¹, right?  If you are not
>> going to modify gnunet.scm, we can fix it right now.
>
> Yes, see also the pending to be retested or whatever by someone
> with commit access patch for the gnunet.scm, thread here:
> http://lists.gnu.org/archive/html/guix-devel/2016-03/msg00464.html

Oh, indeed, I didn't notice you fixed your name there, thanks for
pointing.

-- 
Alex

Re: [PATCH] Update .mailmap.

[Alex Kost]

Ludovic Courtès (2016-03-18 00:35 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> As can be seen with "git --no-pager shortlog -nse", we have several
>> duplicates.  The attached patch should fix those.  I'm Cc-ing this
>> message to people whose names/emails are touched, so you can check
>> whether the proper ones are used.
>
> I think you can wait for a couple of days and commit if there are no
> objections.

Committed.

-- 
Alex