threads / patch / 34658

patch, 2 parts.mailmap organization

Subject: [PATCH 0/2] .mailmap organization

## tl;dr

11 messages between Aug 9, 2013 and Aug 12, 2013. Diffs are folded; open one to read it.

replies: 10people: 4as markdown or json

Stefan Beller· Aug 9, 2013, 18:18 UTC · lore
Hello,
Patch 1 is fixing up the mistakes of the previous series.
Patch 2 should really be discussed as I am unsure about the approach.

During the time trying to get the .mailmap file in shape I wrote lots of emails. There have been many bounces, because some addresses are no longer valid. Sometimes even all email addresses of one name bounced. These people cannot be contacted easily, but we can also not be sure, whether these are one person or indeed 2 persons with the same name having different mail addresses. So that patch is a proposal to just mark those authors in the .mailmap as unreachable via a comment.

Stefan Beller (2):
  .mailmap: fixup entries
  .mailmap: mark bouncing email addresses
 .mailmap | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)
-- 
1.8.4.rc2
Stefan Beller· Aug 9, 2013, 18:18 UTC · re: Stefan Beller · lore

[PATCH 1/2] .mailmap: fixup entries

This patch adds no new names, but fixes the mistakes I made in the previous commits. (94b410bba8, f4f49e225, c07a6bc57, 2013-07-12, .mailmap: Map email addresses to names).

These mistakes are double white spaces between name and surname, different capitalization in email address, or just the email address set as name.

Also I forgot to include James Knight to the mailmap file.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Show changes to .mailmap +7 −2
diff --git a/.mailmap b/.mailmap
index dfa2e65..840abf7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,6 +14,7 @@ Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
 Alex Vandiver <alex@chmrr.net> <alexmv@MIT.EDU>
 Alexander Gavrilov <angavrilov@gmail.com>
 Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
+Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
@@ -31,6 +32,7 @@ Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
 Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
 Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
+Dana L. How <danahow@gmail.com> Dana How
 Daniel Barkalow <barkalow@iabervon.org>
 David Brown <git@davidb.org> <davidb@quicinc.com>
 David D. Kilzer <ddkilzer@kilzer.net>
@@ -65,6 +67,7 @@ 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>
 Jakub Narębski <jnareb@gmail.com>
+James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
@@ -92,8 +95,8 @@ 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>
 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>
+Karl Wiberg <kha@treskal.com> Karl  Hasselström
+Karl Wiberg <kha@treskal.com> <kha@yoghurt.hemma.treskal.com>
 Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
 Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
 Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
@@ -177,6 +180,7 @@ Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
 Ryan Anderson <ryan@michonline.com> <rda@google.com>
 Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
 Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
+Sam Vilain <sam@vilain.net> sam@vilain.net
 Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
 Sean Estabrooks <seanlkml@sympatico.ca>
 Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
@@ -191,6 +195,7 @@ Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
 Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
 Steven Drake <sdrake@xnet.co.nz> <sdrake@ihug.co.nz>
 Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
+Steven Grimm <koreth@midwinter.com> koreth@midwinter.com
 Steven Walter <stevenrwalter@gmail.com> <swalter@lexmark.com>
 Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
 Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>

-- 
1.8.4.rc2
Stefan Beller· Aug 9, 2013, 18:18 UTC · re: Stefan Beller · lore

[PATCH 2/2] .mailmap: mark bouncing email addresses

We cannot be sure whether these are the same person, hence we will not map their different mail addresses to one person. However this commit documents, some bouncing mail addresses, so these need not be tried again, when somebody continues the .mailmap cleanup.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
Show changes to .mailmap +22 −0
diff --git a/.mailmap b/.mailmap
index 840abf7..3b235b5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,10 @@ Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Amos Waterland <apw@rossby.metr.ou.edu>
+Amos Waterland <apw@us.ibm.com>
 Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
 Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
 Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
@@ -34,6 +38,10 @@ Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
 Dana L. How <danahow@gmail.com> Dana How
 Daniel Barkalow <barkalow@iabervon.org>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Daniel Trstenjak <daniel.trstenjak@online.de>
+Daniel Trstenjak <trsten@science-computing.de>
 David Brown <git@davidb.org> <davidb@quicinc.com>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
@@ -68,11 +76,19 @@ J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jakub Narębski <jnareb@gmail.com>
 James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Jason McMullan <jason.mcmullan@timesys.com>
+Jason McMullan <mcmullan@netapp.com>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
 Jeff King <peff@peff.net> <peff@github.com>
 Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Jens Axboe <axboe@suse.de>
+Jens Axboe <jens.axboe@oracle.com>
 Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
@@ -144,6 +160,8 @@ Michele Ballabio <barra_cuda@katamail.com>
 Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
 Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
 Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
 Nanako Shiraishi <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
@@ -177,6 +195,10 @@ Robert Fitzsimons <robfitz@273k.net>
 Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
 Robert Zeh <robert.a.zeh@gmail.com>
 Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Rutger Nijlunsing <rutger@nospam.com>
+Rutger Nijlunsing <git@tux.tmfweb.nl>
 Ryan Anderson <ryan@michonline.com> <rda@google.com>
 Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
 Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>

-- 
1.8.4.rc2
Jonathan Nieder· Aug 9, 2013, 20:01 UTC · re: Stefan Beller · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

Hi,
>From a quick search for homepages:
Stefan Beller wrote:
[...]
> +# The 2 following authors are probably the same person,
> +# but both emails bounce.
> +Amos Waterland <apw@rossby.metr.ou.edu>
> +Amos Waterland <apw@us.ibm.com>
>From the history of http://people.seas.harvard.edu/~apw/sreplay/sreplay.git
this looks like the same person as <apw@debian.org>.
[...]
> +# The 2 following authors are probably the same person,
> +# but both emails bounce.
> +Daniel Trstenjak <daniel.trstenjak@online.de>
> +Daniel Trstenjak <trsten@science-computing.de>
<daniel.trstenjak@gmail.com>
[...]
> +# The 2 following authors are probably the same person,
> +# but both emails bounce.
> +Jason McMullan <jason.mcmullan@timesys.com>
> +Jason McMullan <mcmullan@netapp.com>

A search at http://search.gmane.org/ by name sorted by "Newest first" finds a candidate email address.

> +# The 2 following authors are probably the same person,
> +# but both emails bounce.
> +Jens Axboe <axboe@suse.de>
> +Jens Axboe <jens.axboe@oracle.com>
<axboe@kernel.dk>
> +# The 2 following authors are probably the same person,
> +# but both emails bounce.
>  Nanako Shiraishi <nanako3@bluebottle.com>
>  Nanako Shiraishi <nanako3@lavabit.com>

I don't know how to contact Nanako these days. :( Maybe mailmap should learn a way to say "there's no current public email address for this person".

> +# The 2 following authors are probably the same person,
> +# but both emails bounce.
> +Rutger Nijlunsing <rutger@nospam.com>
> +Rutger Nijlunsing <git@tux.tmfweb.nl>
Probably <rutger.nijlunsing@gmail.com>.

Thanks and hope that helps, Jonathan

Junio C Hamano· Aug 9, 2013, 23:19 UTC · re: Jonathan Nieder · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

Jonathan Nieder <jrnieder@gmail.com> writes:
> From a quick search for homepages:
Thanks for digging.

So I'll discard this patch for now, and instead send this message CC'ed to these guessed addresses.

-- >8 --
Dear Amos, Daniel, Jason, Jens, and Rutger:
    our record indicates that you contributed to our project (Git --
    distributed source control system) in the past under more than
    two e-mail addresses, all of which now seem to be defunct.
    We would want to keep our .mailmap up-to-date, primarily in
    order to consolidate these multiple entries for each of you into
    one.  Could you tell us your preferred e-mail address your
    contributions are listed as?  This message is sent to our best
    current guess of your address.
    Thanks.
Junio C Hamano· Aug 9, 2013, 23:32 UTC · re: Jonathan Nieder · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

Jonathan Nieder <jrnieder@gmail.com> writes:
Show 8 quoted lines
>> +# The 2 following authors are probably the same person,
>> +# but both emails bounce.
>>  Nanako Shiraishi <nanako3@bluebottle.com>
>>  Nanako Shiraishi <nanako3@lavabit.com>
>
> I don't know how to contact Nanako these days. :(  Maybe mailmap
> should learn a way to say "there's no current public email address for
> this person".
I don't, either, but these two entries describe the same person.

One option that I didn't give other old-and-now-left-the-project contributors in my previous message (but I should have) is to let them say: I left the project, you can use my existing contributions, but I prefer you not to list my current address in your address book.

The reason I didn't but I think I should have is because mailmap is not meant to record the current address to be used to contact the person. Its primary purpose is to make sure we group contributions by the same person under a single name. So in that sense, it is OK if they choose to give us the address they used the last time they contributed, even that address no longer works.

I'd suggest using the lavabit address unless we hear the preferred address from her, as the lavabit address was used in 5bf46841 (git-gui: update Japanese translation, 2010-02-02), while the last use of the bluebottle address was in 6762079a (Cloning from a repo without "current branch", 2007-06-16).

Junio C Hamano· Aug 12, 2013, 07:44 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> I'd suggest using the lavabit address unless we hear the preferred
> address from her, as the lavabit address was used in 5bf46841
> (git-gui: update Japanese translation, 2010-02-02), while the last
> use of the bluebottle address was in 6762079a (Cloning from a repo
> without "current branch", 2007-06-16).

So with the above, and the four responses from long-lost friends, here is what I came up with.

-- >8 --
Subject: .mailmap: update long-lost friends with multiple defunct addresses

A handful of past contributors are recorded with multiple e-mail addresses, all of which are undeliberable. With a lot of help from Jonathan, we located all of them except for one. Update the found ones with their currently preferred address, and use the last known address to consolidate contributions by the lost person under a single entry.

Helped-by: Stefan Beller <stefanbeller@googlemail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 .mailmap | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
Show changes to .mailmap +13 −1
diff --git a/.mailmap b/.mailmap
index f7cc21e..7a5d0a6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,8 @@ Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
+Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
+Amos Waterland <apw@debian.org> <apw@us.ibm.com>
 Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
 Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
 Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
@@ -34,6 +36,8 @@ Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
 Dana L. How <danahow@gmail.com> Dana How
 Daniel Barkalow <barkalow@iabervon.org>
+Daniel Trstenjak <daniel.trstenjak@gmail.com> <daniel.trstenjak@online.de>
+Daniel Trstenjak <daniel.trstenjak@gmail.com> <trsten@science-computing.de>
 David Brown <git@davidb.org> <davidb@quicinc.com>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
@@ -68,11 +72,17 @@ J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jakub Narębski <jnareb@gmail.com>
 James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Jason McMullan <jason.mcmullan@timesys.com>
+Jason McMullan <mcmullan@netapp.com>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
 Jeff King <peff@peff.net> <peff@github.com>
 Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
+Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
+Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
 Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
@@ -144,7 +154,7 @@ Michele Ballabio <barra_cuda@katamail.com>
 Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
 Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
 Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
-Nanako Shiraishi <nanako3@bluebottle.com>
+Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
 Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
@@ -177,6 +187,8 @@ Robert Fitzsimons <robfitz@273k.net>
 Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
 Robert Zeh <robert.a.zeh@gmail.com>
 Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
+Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <rutger@nospam.com>
+Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <git@tux.tmfweb.nl>
 Ryan Anderson <ryan@michonline.com> <rda@google.com>
 Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
 Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
Eric Sunshine· Aug 12, 2013, 21:50 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

On Mon, Aug 12, 2013 at 3:44 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Subject: .mailmap: update long-lost friends with multiple defunct addresses
>
> A handful of past contributors are recorded with multiple e-mail
> addresses, all of which are undeliberable.  With a lot of help from
s/undeliberable/undeliverable/
Show 8 quoted lines
> Jonathan, we located all of them except for one.  Update the found
> ones with their currently preferred address, and use the last known
> address to consolidate contributions by the lost person under a
> single entry.
>
> Helped-by: Stefan Beller <stefanbeller@googlemail.com>
> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano· Aug 12, 2013, 07:58 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> I'd suggest using the lavabit address unless we hear the preferred
> address from her, as the lavabit address was used in 5bf46841
> (git-gui: update Japanese translation, 2010-02-02), while the last
> use of the bluebottle address was in 6762079a (Cloning from a repo
> without "current branch", 2007-06-16).

So with the above, and the four responses from long-lost friends, here is what I came up with.

-- >8 --
Subject: .mailmap: update long-lost friends with multiple defunct addresses

A handful of past contributors are recorded with multiple e-mail addresses, all of which are undeliberable. With a lot of help from Jonathan, we located all of them except for one. Update the found ones with their currently preferred address, and use the last known address to consolidate contributions by the lost person under a single entry.

Helped-by: Stefan Beller <stefanbeller@googlemail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 .mailmap | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
Show changes to .mailmap +13 −1
diff --git a/.mailmap b/.mailmap
index f7cc21e..7a5d0a6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,8 @@ Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
+Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
+Amos Waterland <apw@debian.org> <apw@us.ibm.com>
 Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
 Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
 Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
@@ -34,6 +36,8 @@ Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
 Dana L. How <danahow@gmail.com> Dana How
 Daniel Barkalow <barkalow@iabervon.org>
+Daniel Trstenjak <daniel.trstenjak@gmail.com> <daniel.trstenjak@online.de>
+Daniel Trstenjak <daniel.trstenjak@gmail.com> <trsten@science-computing.de>
 David Brown <git@davidb.org> <davidb@quicinc.com>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
@@ -68,11 +72,17 @@ J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jakub Narębski <jnareb@gmail.com>
 James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Jason McMullan <jason.mcmullan@timesys.com>
+Jason McMullan <mcmullan@netapp.com>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
 Jeff King <peff@peff.net> <peff@github.com>
 Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
+Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
+Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
 Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
@@ -144,7 +154,7 @@ Michele Ballabio <barra_cuda@katamail.com>
 Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
 Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
 Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
-Nanako Shiraishi <nanako3@bluebottle.com>
+Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
 Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
@@ -177,6 +187,8 @@ Robert Fitzsimons <robfitz@273k.net>
 Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
 Robert Zeh <robert.a.zeh@gmail.com>
 Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
+Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <rutger@nospam.com>
+Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <git@tux.tmfweb.nl>
 Ryan Anderson <ryan@michonline.com> <rda@google.com>
 Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
 Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
Stefan Beller· Aug 12, 2013, 08:11 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

On 08/12/2013 09:58 AM, Junio C Hamano wrote:
Show 56 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
> 
>> I'd suggest using the lavabit address unless we hear the preferred
>> address from her, as the lavabit address was used in 5bf46841
>> (git-gui: update Japanese translation, 2010-02-02), while the last
>> use of the bluebottle address was in 6762079a (Cloning from a repo
>> without "current branch", 2007-06-16).
> 
> So with the above, and the four responses from long-lost friends,
> here is what I came up with.
> 
> -- >8 --
> Subject: .mailmap: update long-lost friends with multiple defunct addresses
> 
> A handful of past contributors are recorded with multiple e-mail
> addresses, all of which are undeliberable.  With a lot of help from
> Jonathan, we located all of them except for one.  Update the found
> ones with their currently preferred address, and use the last known
> address to consolidate contributions by the lost person under a
> single entry.
> 
> Helped-by: Stefan Beller <stefanbeller@googlemail.com>
> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  .mailmap | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/.mailmap b/.mailmap
> index f7cc21e..7a5d0a6 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -18,6 +18,8 @@ Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
>  Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
>  Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
>  Aneesh Kumar K.V <aneesh.kumar@gmail.com>
> +Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
> +Amos Waterland <apw@debian.org> <apw@us.ibm.com>
>  Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
>  Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
>  Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
> @@ -34,6 +36,8 @@ Dan Johnson <computerdruid@gmail.com>
>  Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
>  Dana L. How <danahow@gmail.com> Dana How
>  Daniel Barkalow <barkalow@iabervon.org>
> +Daniel Trstenjak <daniel.trstenjak@gmail.com> <daniel.trstenjak@online.de>
> +Daniel Trstenjak <daniel.trstenjak@gmail.com> <trsten@science-computing.de>
>  David Brown <git@davidb.org> <davidb@quicinc.com>
>  David D. Kilzer <ddkilzer@kilzer.net>
>  David Kågedal <davidk@lysator.liu.se>
> @@ -68,11 +72,17 @@ J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
>  J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
>  Jakub Narębski <jnareb@gmail.com>
>  James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
> +# The 2 following authors are probably the same person,
> +# but both emails bounce.

You seemed to be sure about Nanako Shiraishi for example, but here you're uncertain, whether he is one person or 2 persons having the same name? I, as a really new contributor, tried a very conservative approach as specially the mailmap is a sensitive field. So in case you'd know he is one person with just different emails, maybe we could write +Jason McMullan <jason.mcmullan@timesys.com> <mcmullan@netapp.com> as it doesn't matter which email comes first (both bounce anyway).

Show 31 quoted lines
> +Jason McMullan <jason.mcmullan@timesys.com>
> +Jason McMullan <mcmullan@netapp.com>
>  Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
>  Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
>  Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
>  Jeff King <peff@peff.net> <peff@github.com>
>  Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
> +Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
> +Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
>  Jim Meyering <jim@meyering.net> <meyering@redhat.com>
>  Joachim Berdal Haga <cjhaga@fys.uio.no>
>  Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
> @@ -144,7 +154,7 @@ Michele Ballabio <barra_cuda@katamail.com>
>  Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
>  Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
>  Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
> -Nanako Shiraishi <nanako3@bluebottle.com>
> +Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
>  Nanako Shiraishi <nanako3@lavabit.com>
>  Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
>  Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
> @@ -177,6 +187,8 @@ Robert Fitzsimons <robfitz@273k.net>
>  Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
>  Robert Zeh <robert.a.zeh@gmail.com>
>  Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
> +Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <rutger@nospam.com>
> +Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <git@tux.tmfweb.nl>
>  Ryan Anderson <ryan@michonline.com> <rda@google.com>
>  Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
>  Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
> 
Ok, I've got more responses, which will follow in the next mail.
Junio C Hamano· Aug 12, 2013, 08:29 UTC · re: Stefan Beller · lore

Re: [PATCH 2/2] .mailmap: mark bouncing email addresses

Stefan Beller <stefanbeller@googlemail.com> writes:
Show 6 quoted lines
>> +# The 2 following authors are probably the same person,
>> +# but both emails bounce.
>
> You seemed to be sure about Nanako Shiraishi for example, 
> but here you're uncertain, whether he is one person 
> or 2 persons having the same name?

Nanako did 70+ patches, and was on many discussion threads, which made me feel that I was corresponding with the same person across address change. I however cannot recall this contributor with just 3 patches whose last contribution was in 2007.

But more importantly, this leftover "unreachable" comment I did not notice before sending the patch out---I did not send any "please ping back" message to any suspected current address for this contributor.

> So in case you'd know he is one person with just different emails, maybe
> we could write 
> +Jason McMullan <jason.mcmullan@timesys.com> <mcmullan@netapp.com>
> as it doesn't matter which email comes first (both bounce anyway).

The last contribution was from netapp.com address in late 2007 (the other address sent two patches in 2005), so I'd suggest making the netapp address the canonical one. If we cannot reach him, that is.

← back to recent threads