threads / patch / 34343

patch, 6 partsCorrections to the mailmap file

Subject: [PATCH 0/6] Corrections to the mailmap file

## tl;dr

18 messages between Jul 4, 2013 and Jul 12, 2013. Diffs are folded; open one to read it.

replies: 17people: 3as markdown or json

Stefan Beller· Jul 4, 2013, 14:04 UTC · lore
Hello,

I noticed many duplicates in email addresses but having the same name by running:

    # Finding out duplicates by comparing names:
    git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d

Most of these entries are most probably the same person, but we cannot be sure, as there might be different persons having the same name, then they are only distinguished by the mail address.

However I suspect most of these to be the same person, having changed mail addresses.

Here comes an initial batch of corrections to the mailmap file, which maps people with email addresses of different capitalization onto the same entity. (Example Name@MIT.EDU is the same as Name@mit.edu)

I intend to contact each of the persons individually and ask whether just their mail address changed, or if they are indeed different persons.

Stefan Beller
Stefan Beller (6):
  .mailmap: Multiple email addresses of Alejandro R. Sedeño
  .mailmap: Multiple mail addresses of Alex Riesen
  .mailmap: Multiple mail addresses of Paul Mackerras
  .mailmap: Multiple mail addresses of Keith Cascio
  .mailmap: Multiple mail addresses of Johannes Schindelin
  .mailmap: Multiple mail addresses of Toby Allsopp
 .mailmap | 9 +++++++++
 1 file changed, 9 insertions(+)
-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 4, 2013, 14:04 UTC · re: Stefan Beller · lore

[PATCH 1/6] .mailmap: Multiple email addresses of Alejandro R. Sedeño

This is obvious as its only difference is capital letters in one of the mail addresses.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)
Show changes to .mailmap +1 −0
diff --git a/.mailmap b/.mailmap
index 345cce6..3a4dd49 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,6 +5,7 @@
 # same person appearing not to be so.
 #
 
+Alejandro R. Sedeño <asedeno@MIT.EDU> <asedeno@mit.edu>
 Alex Bennée <kernel-hacker@bennee.com>
 Alexander Gavrilov <angavrilov@gmail.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>

-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 4, 2013, 14:04 UTC · re: Stefan Beller · lore

[PATCH 2/6] .mailmap: Multiple mail addresses of Alex Riesen

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)
Show changes to .mailmap +3 −0
diff --git a/.mailmap b/.mailmap
index 3a4dd49..cd46d24 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,9 @@
 #
 
 Alejandro R. Sedeño <asedeno@MIT.EDU> <asedeno@mit.edu>
+Alex Riesen <raa.lkml@gmail.com> <fork0@t-online.de>
+Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain>
+Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
 Alex Bennée <kernel-hacker@bennee.com>
 Alexander Gavrilov <angavrilov@gmail.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>

-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 4, 2013, 14:04 UTC · re: Stefan Beller · lore

[PATCH 3/6] .mailmap: Multiple mail addresses of Paul Mackerras

This is an obvious one, as the .(none) addresses are not valid mail addresses.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)
Show changes to .mailmap +2 −0
diff --git a/.mailmap b/.mailmap
index cd46d24..6d75678 100644
--- a/.mailmap
+++ b/.mailmap
@@ -76,6 +76,8 @@ Nanako Shiraishi <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 <nico@fluxnic.net> <nico@cam.org>
+Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
+Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
 Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
 Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
 Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>

-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 4, 2013, 14:04 UTC · re: Stefan Beller · lore

[PATCH 4/6] .mailmap: Multiple mail addresses of Keith Cascio

Capital letters in mail address.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)
Show changes to .mailmap +1 −0
diff --git a/.mailmap b/.mailmap
index 6d75678..1e94906 100644
--- a/.mailmap
+++ b/.mailmap
@@ -52,6 +52,7 @@ Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
 Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
 Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
 Karl Hasselström <kha@treskal.com>
+Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
 Kevin Leung <kevinlsk@gmail.com>
 Kent Engstrom <kent@lysator.liu.se>
 Lars Doelle <lars.doelle@on-line ! de>

-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 4, 2013, 14:04 UTC · re: Stefan Beller · lore

[PATCH 5/6] .mailmap: Multiple mail addresses of Johannes Schindelin

Different capitalization.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)
Show changes to .mailmap +1 −0
diff --git a/.mailmap b/.mailmap
index 1e94906..d7d7b89 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,6 +38,7 @@ Jakub Narębski <jnareb@gmail.com>
 Jay Soffian <jaysoffian+git@gmail.com>
 Jeff King <peff@peff.net> <peff@github.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
+Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
 Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>

-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 4, 2013, 14:04 UTC · re: Stefan Beller · lore

[PATCH 6/6] .mailmap: Multiple mail addresses of Toby Allsopp

Different capitalization
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)
Show changes to .mailmap +1 −0
diff --git a/.mailmap b/.mailmap
index d7d7b89..7e5638d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -97,6 +97,7 @@ Steven Grimm <koreth@midwinter.com>
 Tay Ray Chuan <rctay89@gmail.com>
 Theodore Ts'o <tytso@mit.edu>
 Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
+Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
 Tony Luck <tony.luck@intel.com>
 Uwe Kleine-König <Uwe_Zeisberger@digi.com>
 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 4, 2013, 14:37 UTC · re: Stefan Beller · lore

Re: [PATCH 0/6] Corrections to the mailmap file

Here is a script to display the entries I was referring to: --- #!/bin/bash

git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d > mailmapdoubles
while read line ; do
	# remove leading whitespace
	trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g')
	echo "git shortlog -sne | grep \""$trimmed"\""
done < mailmapdoubles > mailmapdoubles2

sh mailmapdoubles2 rm mailmapdoubles rm mailmapdoubles2

On 07/04/2013 04:04 PM, Stefan Beller wrote:
Show 36 quoted lines
> Hello,
> 
> I noticed many duplicates in email addresses but having the same name by
> running:
> 
>     # Finding out duplicates by comparing names:
>     git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
> 
> Most of these entries are most probably the same person, but we cannot be 
> sure, as there might be different persons having the same name, then they
> are only distinguished by the mail address.
> 
> However I suspect most of these to be the same person, having changed 
> mail addresses.
> 
> Here comes an initial batch of corrections to the mailmap file, which
> maps people with email addresses of different capitalization onto
> the same entity.
> (Example Name@MIT.EDU is the same as Name@mit.edu)
> 
> I intend to contact each of the persons individually and ask whether 
> just their mail address changed, or if they are indeed different persons.
> 
> Stefan Beller
> 
> Stefan Beller (6):
>   .mailmap: Multiple email addresses of Alejandro R. Sedeño
>   .mailmap: Multiple mail addresses of Alex Riesen
>   .mailmap: Multiple mail addresses of Paul Mackerras
>   .mailmap: Multiple mail addresses of Keith Cascio
>   .mailmap: Multiple mail addresses of Johannes Schindelin
>   .mailmap: Multiple mail addresses of Toby Allsopp
> 
>  .mailmap | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
Junio C Hamano· Jul 11, 2013, 17:33 UTC · re: Stefan Beller · lore

Re: [PATCH 0/6] Corrections to the mailmap file

Stefan Beller <stefanbeller@googlemail.com> writes:
Show 21 quoted lines
>
> I noticed many duplicates in email addresses but having the same name by
> running:
>
>     # Finding out duplicates by comparing names:
>     git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
>
> Most of these entries are most probably the same person, but we cannot be 
> sure, as there might be different persons having the same name, then they
> are only distinguished by the mail address.
>
> However I suspect most of these to be the same person, having changed 
> mail addresses.
>
> Here comes an initial batch of corrections to the mailmap file, which
> maps people with email addresses of different capitalization onto
> the same entity.
> (Example Name@MIT.EDU is the same as Name@mit.edu)
>
> I intend to contact each of the persons individually and ask whether 
> just their mail address changed, or if they are indeed different persons.
Has anything happen to this topic sice you posted?
I think:
 - .(none) is obviously bad, and we can fix without waiting for
   responses as long as we know the replacement address is the
   address from the list we usually see on the list (3).
 - Domain part is defined to be case insensitive (e.g. @mit.edu vs
   @MIT.EDU), so both forms are equally valid.  The owner of the
   address may have preferences (1 and 4), though.
   For this, we could just declare we downcase the domain part.
 - The local-part, even though RFC 2821 says "local-part of a
   mailbox MUST BE treated as case sensitive", is often case
   insensitive, and User.Name@domain and user.name@domain often name
   the same mailbox.  The owner of the address may have preferences
   (5 and 6), though.
   For this, we could just declare we Camel.Case the local part,
   after making sure Camel.Case@domain has been used by the owner of
   the address on this list.
So where does that leave us?
We can apply without waiting:
  1: downcase domain
  3: .(none) and we know paulus@samba.org
  4: downcase domain
  5: We recently saw Dshco calls himself <Johannes.Schindelin@domain>.
  6: The latest one from Nov 2009 uses <Toby.Allsopp@domain>.

The only possibly iffy one is Alex Riesen, but <raa.lkml@domain> seems to be the one he uses here, so I think 2. is also fine.

Stefan Beller· Jul 11, 2013, 17:52 UTC · re: Junio C Hamano · lore

Re: [PATCH 0/6] Corrections to the mailmap file

On 07/11/2013 07:33 PM, Junio C Hamano wrote:
Show 60 quoted lines
> Stefan Beller <stefanbeller@googlemail.com> writes:
>>
>> I noticed many duplicates in email addresses but having the same name by
>> running:
>>
>>     # Finding out duplicates by comparing names:
>>     git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
>>
>> Most of these entries are most probably the same person, but we cannot be 
>> sure, as there might be different persons having the same name, then they
>> are only distinguished by the mail address.
>>
>> However I suspect most of these to be the same person, having changed 
>> mail addresses.
>>
>> Here comes an initial batch of corrections to the mailmap file, which
>> maps people with email addresses of different capitalization onto
>> the same entity.
>> (Example Name@MIT.EDU is the same as Name@mit.edu)
>>
>> I intend to contact each of the persons individually and ask whether 
>> just their mail address changed, or if they are indeed different persons.
> 
> Has anything happen to this topic sice you posted?
> 
> I think:
> 
>  - .(none) is obviously bad, and we can fix without waiting for
>    responses as long as we know the replacement address is the
>    address from the list we usually see on the list (3).
> 
>  - Domain part is defined to be case insensitive (e.g. @mit.edu vs
>    @MIT.EDU), so both forms are equally valid.  The owner of the
>    address may have preferences (1 and 4), though.
> 
>    For this, we could just declare we downcase the domain part.
> 
>  - The local-part, even though RFC 2821 says "local-part of a
>    mailbox MUST BE treated as case sensitive", is often case
>    insensitive, and User.Name@domain and user.name@domain often name
>    the same mailbox.  The owner of the address may have preferences
>    (5 and 6), though.
> 
>    For this, we could just declare we Camel.Case the local part,
>    after making sure Camel.Case@domain has been used by the owner of
>    the address on this list.
> 
> So where does that leave us?
> 
> We can apply without waiting:
> 
>   1: downcase domain
>   3: .(none) and we know paulus@samba.org
>   4: downcase domain
>   5: We recently saw Dshco calls himself <Johannes.Schindelin@domain>.
>   6: The latest one from Nov 2009 uses <Toby.Allsopp@domain>.
> 
> The only possibly iffy one is Alex Riesen, but <raa.lkml@domain>
> seems to be the one he uses here, so I think 2. is also fine.
>

To be honest, I did not continue to work on this. I was waiting for the first few patches to be reviewed, because I was not sure how important you all think this topic really is. I know projects, which frown upon such beautyfing commits. Hence I was waiting for an answer, whether such work is appreciated.

Anyway, last time I tried contributing to git, I was told to explicitely do it in the open. I did forget to CC the mailing list when asking Alex Riesen (2nd patch), whether it's all him. I do see the benefit of the openess, when discussing code or documentation, but I wonder if you'd also like to see these 'Hello, are you the person having email x, y and z?' kind of mails put on the mailing list as well. That would be 120 to go, which may be undesired?

So I'll start contacting the other people now.
Junio C Hamano· Jul 11, 2013, 18:16 UTC · re: Stefan Beller · lore

Re: [PATCH 0/6] Corrections to the mailmap file

Stefan Beller <stefanbeller@googlemail.com> writes:
Show 12 quoted lines
> On 07/11/2013 07:33 PM, Junio C Hamano wrote:
>> Stefan Beller <stefanbeller@googlemail.com> writes:
>>> ...
>>> I intend to contact each of the persons individually and ask whether 
>>> just their mail address changed, or if they are indeed different persons.
>> 
>> Has anything happen to this topic sice you posted?
>>  ...
> I do see the benefit of the openess, when discussing code 
> or documentation, but I wonder if you'd also like to see these
> 'Hello, are you the person having email x, y and z?' 
> kind of mails put on the mailing list as well.

I read, from your 'I intend to contact ... individiually', that you would have already sent such private inquiries.

I was reviewing my mailbox for possible "fell into cracks" topics, and found that nothing seems to have happened since then. I guessed that since they you may already have received responses to allow us to move forward with this series, hence my "ping".

I do not see a need for "are you still at this address?" to be made in public. It is fine and probably even preferrable to see a single patch that corrects multiple .mailmap entries, with a proposed log message that says "I've contacted everybody whose address is affected by this change and made sure the replacement address is correct." We trust you ;-)

Of course, you may want to Bcc: such a patch to them to give them another chance to double-check as a courtesy.

Thanks.
Stefan Beller· Jul 12, 2013, 11:49 UTC · re: Junio C Hamano · lore

[PATCH v2] Corrections to the mailmap file

By now I contacted more than half the people, who might get some .mailmap entries. Not all of them have responded, but maybe 2/3 of those, whom I contacted.

I used 2 branches to get this work done. One branch having all the proposed patches, where each patch just changes one name, so I can send it to that specific person for review. The second branch would be slightly behind the first branch and only have the patches of the confirmed .mailmap changes. The following patch is a squashed version of the confirmed branch.

Whenever somebody confirmed their patch, I'd include it into the confirmed branch and rebase the first branch on top of it. That works fine, if there are no many commits in between, so no merge conflicts occur.

Junio, therefore I'd ask to include the following patch as the 1/3 milestone in the mailmap completion, so the number of my local patches floating around is reduced.

The 6 patches sent at 4th July are not required anymore, but the following patch directly applies to your master branch.

Stefan Beller (1):
  .mailmap: Map email addresses to names
 .mailmap | 95 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 24 deletions(-)
-- 
1.8.3.2.636.g7943f03
Stefan Beller· Jul 12, 2013, 11:49 UTC · re: Stefan Beller · lore

[PATCH] .mailmap: Map email addresses to names

People change email addresses quite often and sometimes forget to add their entry to the mailmap file. I have contacted lots of people, whose name occurs multiple times in the short log having different email addresses. The entries in the mailmap of this patch are either confirmed by them or are trivial. Trivial means different capitalisation of the domain (@MIT.EDU and @mit.edu) or the domain was localhost, (none) or @local.

Additionally to adding (name, email) mappings to the .mailmap file, it has also been sorted alphabetically. (which explains the removals, which are added 3 lines later on again)

While the most changes happen at the email addresses, we also have a name change in here. Karl Hasselström is now known as Karl Wiberg due to marriage. Congratulations!

To find out whom to contact I used the following small
script:
---
    #!/bin/bash
    git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d > mailmapdoubles
    while read line ; do
        # remove leading whitespace
        trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g')
        echo "git shortlog -sne | grep \""$trimmed"\""
    done < mailmapdoubles > mailmapdoubles2
    sh mailmapdoubles2
    rm mailmapdoubles
    rm mailmapdoubles2
---
Also interesting for similar tasks are these snippets:
    # Finding out duplicates by comparing email addresses:
    git shortlog -sne |awk '{ print $NF }' |sort |uniq -d
    # Finding out duplicates by comparing names:
    git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
---
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 95 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 24 deletions(-)
Show changes to .mailmap +71 −24
diff --git a/.mailmap b/.mailmap
index 345cce6..1179767 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,99 +5,146 @@
 # same person appearing not to be so.
 #
 
-Alex Bennée <kernel-hacker@bennee.com>
+Alejandro R. Sedeño <asedeno@MIT.EDU> <asedeno@mit.edu>
 Alexander Gavrilov <angavrilov@gmail.com>
+Alex Bennée <kernel-hacker@bennee.com>
+Alex Riesen <raa.lkml@gmail.com> <fork0@t-online.de>
+Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain>
+Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
+Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
+Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
+anonymous <linux@horizon.com>
+anonymous <linux@horizon.net>
+Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 Cheng Renquan <crquan@gmail.com>
 Chris Shoemaker <c.shoemaker@cox.net>
-Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com>
 Dana L. How <how@deathvalley.cswitch.com>
 Daniel Barkalow <barkalow@iabervon.org>
+Dan Johnson <computerdruid@gmail.com>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
+David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
 David S. Miller <davem@davemloft.net>
 Deskin Miller <deskinm@umich.edu>
 Dirk Süsserott <newsletter@dirk.my1.cc>
 Eric S. Raymond <esr@thyrsus.com>
 Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
-Fredrik Kuivinen <freku045@student.liu.se>
+Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
+Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
+Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
+Frank Lichtenheld <frank@lichtenheld.de> <flichtenheld@astaro.com>
 Frédéric Heitzmann <frederic.heitzmann@gmail.com>
+Fredrik Kuivinen <freku045@student.liu.se>
+Han-Wen Nienhuys <hanwen@google.com> Han-Wen Nienhuys <hanwen@xs4all.nl>
 H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
-H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
-H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
-H. Peter Anvin <hpa@trantor.hos.anvin.org>
 Horst H. von Brand <vonbrand@inf.utfsm.cl>
+H. Peter Anvin <hpa@zytor.com> <hpa@bonde.sc.orionmulti.com>
+H. Peter Anvin <hpa@zytor.com> <hpa@smyrno.hos.anvin.org>
+H. Peter Anvin <hpa@zytor.com> <hpa@tazenda.sc.orionmulti.com>
+H. Peter Anvin <hpa@zytor.com> <hpa@trantor.hos.anvin.org>
 İsmail Dönmez <ismail@pardus.org.tr>
 Jakub Narębski <jnareb@gmail.com>
-Jay Soffian <jaysoffian+git@gmail.com>
+Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
+J. Bruce Fields <bfields@citi.umich.edu> <bfields@fieldses.org>
+J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
+J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jeff King <peff@peff.net> <peff@github.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
+Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
-Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
+Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
+Jonathan Nieder <jrnieder@gmail.com> <jrnieder@uchicago.edu>
 Jon Loeliger <jdl@freescale.com>
 Jon Seymour <jon@blackcubes.dyndns.org>
-Jonathan Nieder <jrnieder@uchicago.edu>
 Junio C Hamano <gitster@pobox.com> <gitster@pobox.com>
-Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
-Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
-Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
 Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
 Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
+Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
+Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
 Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
-Karl Hasselström <kha@treskal.com>
-Kevin Leung <kevinlsk@gmail.com>
+Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
+Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@treskal.com>
+Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@yoghurt.hemma.treskal.com>
+Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
+Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
+Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
 Kent Engstrom <kent@lysator.liu.se>
+Kevin Leung <kevinlsk@gmail.com>
+Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
+Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
 Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <lars.doelle@on-line.de>
 Li Hong <leehong@pku.edu.cn>
-Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
-Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
-Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org.(none)>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
 Lukas Sandström <lukass@etek.chalmers.se>
 Marc-André Lureau <marcandre.lureau@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>
+Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
+Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
+Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
 Michael Coleman <tutufan@gmail.com>
 Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
+Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>
+Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
 Michael W. Olson <mwolson@gnu.org>
 Michele Ballabio <barra_cuda@katamail.com>
+Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
+Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
+Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 <nico@fluxnic.net> <nico@cam.org>
-Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
+Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
+Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
+Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
+Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
 Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
+Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
 Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
+Petr Baudis <pasky@ucw.cz> <xpasky@machine>
 Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 René Scharfe <rene.scharfe@lsrfire.ath.cx>
 Robert Fitzsimons <robfitz@273k.net>
 Robert Zeh <robert.a.zeh@gmail.com>
+Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
+Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
 Sam Vilain <sam@vilain.net>
-Santi Béjar <sbejar@gmail.com>
+Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
 Sean Estabrooks <seanlkml@sympatico.ca>
+Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
 Shawn O. Pearce <spearce@spearce.org>
-Steven Grimm <koreth@midwinter.com>
+Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
+Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
+Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
+Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
 Tay Ray Chuan <rctay89@gmail.com>
 Theodore Ts'o <tytso@mit.edu>
+Thomas Ackermann <th.acker@arcor.de> <th.acker66@arcor.de>
 Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
+Timo Hirvonen <tihirvon@gmail.com> <tihirvon@ee.oulu.fi>
+Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
 Tony Luck <tony.luck@intel.com>
-Uwe Kleine-König <Uwe_Zeisberger@digi.com>
-Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
+Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
+Uwe Kleine-König <Uwe_Zeisberger@digi.com>
 Uwe Kleine-König <uzeisberger@io.fsforth.de>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
 Vitaly "_Vi" Shukela <public_vi@tut.by>
 William Pursell <bill.pursell@gmail.com>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-anonymous <linux@horizon.com>
-anonymous <linux@horizon.net>
+

-- 
1.8.3.2.636.g7943f03
Junio C Hamano· Jul 12, 2013, 16:31 UTC · re: Stefan Beller · lore

Re: [PATCH] .mailmap: Map email addresses to names

Stefan Beller <stefanbeller@googlemail.com> writes:
Show 44 quoted lines
> People change email addresses quite often and sometimes
> forget to add their entry to the mailmap file.
> I have contacted lots of people, whose name occurs
> multiple times in the short log having different
> email addresses. The entries in the mailmap of
> this patch are either confirmed by them or are trivial.
> Trivial means different capitalisation of the domain
> (@MIT.EDU and @mit.edu) or the domain was localhost,
> (none) or @local.
>
> Additionally to adding (name, email) mappings to the
> .mailmap file, it has also been sorted alphabetically.
> (which explains the removals, which are added
> 3 lines later on again)
>
> While the most changes happen at the email addresses,
> we also have a name change in here. Karl Hasselström
> is now known as Karl Wiberg due to marriage. Congratulations!
>
> To find out whom to contact I used the following small
> script:
> ---
>     #!/bin/bash
>     git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d > mailmapdoubles
>     while read line ; do
>         # remove leading whitespace
>         trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g')
>         echo "git shortlog -sne | grep \""$trimmed"\""
>     done < mailmapdoubles > mailmapdoubles2
>     sh mailmapdoubles2
>     rm mailmapdoubles
>     rm mailmapdoubles2
> ---
> Also interesting for similar tasks are these snippets:
>
>     # Finding out duplicates by comparing email addresses:
>     git shortlog -sne |awk '{ print $NF }' |sort |uniq -d
>
>     # Finding out duplicates by comparing names:
>     git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
> ---
>
> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
> ---

Thanks, but please be careful about these three-dashes when sending the next batch. As you may have already guessed, Git cannot guess reliably which one of the abouve four three-dash lines is the end of the proposed log message, and cuts at the first one.

Show 178 quoted lines
>  .mailmap | 95 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
>  1 file changed, 71 insertions(+), 24 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index 345cce6..1179767 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -5,99 +5,146 @@
>  # same person appearing not to be so.
>  #
>  
> -Alex Bennée <kernel-hacker@bennee.com>
> +Alejandro R. Sedeño <asedeno@MIT.EDU> <asedeno@mit.edu>
>  Alexander Gavrilov <angavrilov@gmail.com>
> +Alex Bennée <kernel-hacker@bennee.com>
> +Alex Riesen <raa.lkml@gmail.com> <fork0@t-online.de>
> +Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain>
> +Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
> +Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
> +Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
>  Aneesh Kumar K.V <aneesh.kumar@gmail.com>
> +anonymous <linux@horizon.com>
> +anonymous <linux@horizon.net>
> +Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
>  Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
>  Cheng Renquan <crquan@gmail.com>
>  Chris Shoemaker <c.shoemaker@cox.net>
> -Dan Johnson <computerdruid@gmail.com>
>  Dana L. How <danahow@gmail.com>
>  Dana L. How <how@deathvalley.cswitch.com>
>  Daniel Barkalow <barkalow@iabervon.org>
> +Dan Johnson <computerdruid@gmail.com>
>  David D. Kilzer <ddkilzer@kilzer.net>
>  David Kågedal <davidk@lysator.liu.se>
> +David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
>  David S. Miller <davem@davemloft.net>
>  Deskin Miller <deskinm@umich.edu>
>  Dirk Süsserott <newsletter@dirk.my1.cc>
>  Eric S. Raymond <esr@thyrsus.com>
>  Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
> -Fredrik Kuivinen <freku045@student.liu.se>
> +Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
> +Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
> +Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
> +Frank Lichtenheld <frank@lichtenheld.de> <flichtenheld@astaro.com>
>  Frédéric Heitzmann <frederic.heitzmann@gmail.com>
> +Fredrik Kuivinen <freku045@student.liu.se>
> +Han-Wen Nienhuys <hanwen@google.com> Han-Wen Nienhuys <hanwen@xs4all.nl>
>  H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
> -H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
> -H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
> -H. Peter Anvin <hpa@trantor.hos.anvin.org>
>  Horst H. von Brand <vonbrand@inf.utfsm.cl>
> +H. Peter Anvin <hpa@zytor.com> <hpa@bonde.sc.orionmulti.com>
> +H. Peter Anvin <hpa@zytor.com> <hpa@smyrno.hos.anvin.org>
> +H. Peter Anvin <hpa@zytor.com> <hpa@tazenda.sc.orionmulti.com>
> +H. Peter Anvin <hpa@zytor.com> <hpa@trantor.hos.anvin.org>
>  İsmail Dönmez <ismail@pardus.org.tr>
>  Jakub Narębski <jnareb@gmail.com>
> -Jay Soffian <jaysoffian+git@gmail.com>
> +Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
> +J. Bruce Fields <bfields@citi.umich.edu> <bfields@fieldses.org>
> +J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
> +J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
>  Jeff King <peff@peff.net> <peff@github.com>
>  Joachim Berdal Haga <cjhaga@fys.uio.no>
> +Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
>  Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
> -Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
>  Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
> +Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
> +Jonathan Nieder <jrnieder@gmail.com> <jrnieder@uchicago.edu>
>  Jon Loeliger <jdl@freescale.com>
>  Jon Seymour <jon@blackcubes.dyndns.org>
> -Jonathan Nieder <jrnieder@uchicago.edu>
>  Junio C Hamano <gitster@pobox.com> <gitster@pobox.com>
> -Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
> -Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
> -Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
>  Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
>  Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
> +Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
> +Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
>  Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
> -Karl Hasselström <kha@treskal.com>
> -Kevin Leung <kevinlsk@gmail.com>
> +Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
> +Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@treskal.com>
> +Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@yoghurt.hemma.treskal.com>
> +Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
> +Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
> +Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
>  Kent Engstrom <kent@lysator.liu.se>
> +Kevin Leung <kevinlsk@gmail.com>
> +Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
> +Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
>  Lars Doelle <lars.doelle@on-line ! de>
>  Lars Doelle <lars.doelle@on-line.de>
>  Li Hong <leehong@pku.edu.cn>
> -Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
> -Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
> -Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
>  Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
> +Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
> +Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
>  Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org>
>  Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org.(none)>
> +Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
>  Lukas Sandström <lukass@etek.chalmers.se>
>  Marc-André Lureau <marcandre.lureau@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>
> +Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
> +Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
> +Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
>  Michael Coleman <tutufan@gmail.com>
>  Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
> +Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>
> +Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
>  Michael W. Olson <mwolson@gnu.org>
>  Michele Ballabio <barra_cuda@katamail.com>
> +Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
> +Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
> +Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
>  Nanako Shiraishi <nanako3@bluebottle.com>
>  Nanako Shiraishi <nanako3@lavabit.com>
>  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>  <nico@fluxnic.net> <nico@cam.org>
> -Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
> +Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
> +Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
> +Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
> +Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
>  Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
> +Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
>  Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
> +Petr Baudis <pasky@ucw.cz> <xpasky@machine>
>  Philippe Bruhat <book@cpan.org>
>  Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
>  Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
>  René Scharfe <rene.scharfe@lsrfire.ath.cx>
>  Robert Fitzsimons <robfitz@273k.net>
>  Robert Zeh <robert.a.zeh@gmail.com>
> +Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
> +Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
>  Sam Vilain <sam@vilain.net>
> -Santi Béjar <sbejar@gmail.com>
> +Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
>  Sean Estabrooks <seanlkml@sympatico.ca>
> +Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
>  Shawn O. Pearce <spearce@spearce.org>
> -Steven Grimm <koreth@midwinter.com>
> +Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
> +Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
> +Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
> +Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
>  Tay Ray Chuan <rctay89@gmail.com>
>  Theodore Ts'o <tytso@mit.edu>
> +Thomas Ackermann <th.acker@arcor.de> <th.acker66@arcor.de>
>  Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
> +Timo Hirvonen <tihirvon@gmail.com> <tihirvon@ee.oulu.fi>
> +Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
>  Tony Luck <tony.luck@intel.com>
> -Uwe Kleine-König <Uwe_Zeisberger@digi.com>
> -Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
>  Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
> +Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
> +Uwe Kleine-König <Uwe_Zeisberger@digi.com>
>  Uwe Kleine-König <uzeisberger@io.fsforth.de>
>  Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
>  Ville Skyttä <scop@xemacs.org>
>  Vitaly "_Vi" Shukela <public_vi@tut.by>
>  William Pursell <bill.pursell@gmail.com>
>  YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> -anonymous <linux@horizon.com>
> -anonymous <linux@horizon.net>
> +
Jonathan Nieder· Jul 12, 2013, 18:57 UTC · re: Stefan Beller · lore

Re: [PATCH] .mailmap: Map email addresses to names

Stefan Beller wrote:
> --- a/.mailmap
> +++ b/.mailmap
> @@ -5,99 +5,146 @@
[...]
Show 6 quoted lines
>  Chris Shoemaker <c.shoemaker@cox.net>
> -Dan Johnson <computerdruid@gmail.com>
>  Dana L. How <danahow@gmail.com>
>  Dana L. How <how@deathvalley.cswitch.com>
>  Daniel Barkalow <barkalow@iabervon.org>
> +Dan Johnson <computerdruid@gmail.com>

Small nit: the sorting looks broken here and in similar places below (the usual ordering is Dan < Dana < Daniel).

Thanks, Jonathan

Stefan Beller· Jul 12, 2013, 19:02 UTC · re: Jonathan Nieder · lore

Re: [PATCH] .mailmap: Map email addresses to names

Which tool would you recommend to sort stuff? Or rather the exact parameters for /usr/bin/sort ?

Thanks, Stefan

On 07/12/2013 08:57 PM, Jonathan Nieder wrote:
Show 19 quoted lines
> Stefan Beller wrote:
> 
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -5,99 +5,146 @@
> [...]
>>  Chris Shoemaker <c.shoemaker@cox.net>
>> -Dan Johnson <computerdruid@gmail.com>
>>  Dana L. How <danahow@gmail.com>
>>  Dana L. How <how@deathvalley.cswitch.com>
>>  Daniel Barkalow <barkalow@iabervon.org>
>> +Dan Johnson <computerdruid@gmail.com>
> 
> Small nit: the sorting looks broken here and in similar places below
> (the usual ordering is Dan < Dana < Daniel).
> 
> Thanks,
> Jonathan
>
Stefan Beller· Jul 12, 2013, 19:10 UTC · re: Stefan Beller · lore

Re: [PATCH] .mailmap: Map email addresses to names

>From the man page
*** WARNING *** The locale specified by the environment affects sort
order.  Set LC_ALL=C to get the traditional sort  order  that  uses
       native byte values.
And indeed I can avoid being nitpicked again for wrong sorting. ;)
On 07/12/2013 09:02 PM, Stefan Beller wrote:
Show 28 quoted lines
> 
> Which tool would you recommend to sort stuff?
> Or rather the exact parameters for /usr/bin/sort ?
> 
> Thanks,
> Stefan
> 
> On 07/12/2013 08:57 PM, Jonathan Nieder wrote:
>> Stefan Beller wrote:
>>
>>> --- a/.mailmap
>>> +++ b/.mailmap
>>> @@ -5,99 +5,146 @@
>> [...]
>>>  Chris Shoemaker <c.shoemaker@cox.net>
>>> -Dan Johnson <computerdruid@gmail.com>
>>>  Dana L. How <danahow@gmail.com>
>>>  Dana L. How <how@deathvalley.cswitch.com>
>>>  Daniel Barkalow <barkalow@iabervon.org>
>>> +Dan Johnson <computerdruid@gmail.com>
>>
>> Small nit: the sorting looks broken here and in similar places below
>> (the usual ordering is Dan < Dana < Daniel).
>>
>> Thanks,
>> Jonathan
>>
>
Junio C Hamano· Jul 12, 2013, 16:27 UTC · re: Stefan Beller · lore

Re: [PATCH v2] Corrections to the mailmap file

Stefan Beller <stefanbeller@googlemail.com> writes:
Show 29 quoted lines
> By now I contacted more than half the people, who might
> get some .mailmap entries. Not all of them have responded,
> but maybe 2/3 of those, whom I contacted.
>
> I used 2 branches to get this work done. One branch having
> all the proposed patches, where each patch just changes one
> name, so I can send it to that specific person for review.
> The second branch would be slightly behind the first branch
> and only have the patches of the confirmed .mailmap changes.
> The following patch is a squashed version of the confirmed 
> branch.
>
> Whenever somebody confirmed their patch, I'd include it
> into the confirmed branch and rebase the first branch on top
> of it. That works fine, if there are no many commits
> in between, so no merge conflicts occur.
>
> Junio, therefore I'd ask to include the following patch as 
> the 1/3 milestone in the mailmap completion, so the number of
> my local patches floating around is reduced.
>
> The 6 patches sent at 4th July are not required anymore,
> but the following patch directly applies to your master branch.
>
> Stefan Beller (1):
>   .mailmap: Map email addresses to names
>
>  .mailmap | 95 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
>  1 file changed, 71 insertions(+), 24 deletions(-)
Thanks.

← back to recent threads