From 94b410bba864fed964ef2177278432c89d402adc Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 12 Jul 2013 21:21:21 +0200 Subject: [PATCH 1/3] .mailmap: Map email addresses to names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 ("LC_ALL=C /usr/bin/sort", byte-value sort). 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 Signed-off-by: Junio C Hamano --- .mailmap | 135 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 110 insertions(+), 25 deletions(-) diff --git a/.mailmap b/.mailmap index 345cce698a..22d3d70791 100644 --- a/.mailmap +++ b/.mailmap @@ -5,99 +5,184 @@ # same person appearing not to be so. # + +Alejandro R. Sedeño Alex Bennée +Alex Riesen +Alex Riesen +Alex Riesen +Alex Vandiver Alexander Gavrilov +Alexey Shumkin +Anders Kaseorg +Anders Kaseorg Aneesh Kumar K.V +Bernt Hansen +Brandon Casey Brian M. Carlson +Bryan Larsen +Bryan Larsen Cheng Renquan Chris Shoemaker Dan Johnson Dana L. How Dana L. How Daniel Barkalow +David Brown David D. Kilzer David Kågedal +David Reiss David S. Miller Deskin Miller Dirk Süsserott +Eric Blake +Eric Hanchrow Eric S. Raymond Erik Faye-Lund +Eyvind Bernhardsen +Florian Achleitner +Franck Bui-Huu +Frank Lichtenheld +Frank Lichtenheld Fredrik Kuivinen Frédéric Heitzmann H. Merijn Brand H.Merijn Brand -H. Peter Anvin -H. Peter Anvin -H. Peter Anvin +H. Peter Anvin +H. Peter Anvin +H. Peter Anvin +H. Peter Anvin +Han-Wen Nienhuys Han-Wen Nienhuys Horst H. von Brand -İsmail Dönmez +J. Bruce Fields +J. Bruce Fields +J. Bruce Fields Jakub Narębski -Jay Soffian +Jason Riedy +Jason Riedy +Jay Soffian Jeff King +Jeff Muizelaar Joachim Berdal Haga -Johannes Sixt -Johannes Sixt +Johannes Schindelin Johannes Sixt +Johannes Sixt +Johannes Sixt Jon Loeliger -Jon Seymour -Jonathan Nieder +Jon Seymour +Jonathan Nieder +Jonathan del Strother +Josh Triplett +Josh Triplett +Julian Phillips Junio C Hamano -Junio C Hamano -Junio C Hamano -Junio C Hamano Junio C Hamano Junio C Hamano +Junio C Hamano +Junio C Hamano Junio C Hamano -Karl Hasselström -Kevin Leung +Junio C Hamano +Karl Wiberg Karl Hasselström +Karl Wiberg Karl Hasselström +Karsten Blees +Karsten Blees +Kay Sievers +Kay Sievers +Keith Cascio Kent Engstrom +Kevin Leung +Kirill Smelkov +Kirill Smelkov +Knut Franke Lars Doelle Lars Doelle Li Hong -Linus Torvalds -Linus Torvalds -Linus Torvalds Linus Torvalds -Linus Torvalds +Linus Torvalds +Linus Torvalds Linus Torvalds -Lukas Sandström +Linus Torvalds +Linus Torvalds +Lukas Sandström +Marc Khouzam Marc-André Lureau +Marco Costalba +Mark Levedahl Mark Rada Martin Langhoff Martin von Zweigbergk +Matt Draisey +Matt Kraai +Matthias Kestenholz +Matthias Urlichs +Matthias Urlichs Michael Coleman Michael J Gruber Michael W. Olson +Michael Witten +Michael Witten Michele Ballabio +Miklos Vajna +Namhyung Kim +Namhyung Kim Nanako Shiraishi Nanako Shiraishi +Nelson Elhage +Nelson Elhage Nguyễn Thái Ngọc Duy - -Peter Krefting +Nicolas Morey-Chaisemartin +Nicolas Morey-Chaisemartin +Paolo Bonzini +Pascal Obry +Pascal Obry +Pat Notz +Paul Mackerras +Paul Mackerras Peter Krefting +Peter Krefting Petr Baudis +Petr Baudis +Phil Hord +Philip Jägenstedt +Philipp A. Hartmann Philippe Bruhat Ralf Thielow Ramsay Allan Jones René Scharfe Robert Fitzsimons Robert Zeh -Sam Vilain -Santi Béjar +Robin Rosenberg +Salikh Zakirov +Sam Vilain +Santi Béjar Sean Estabrooks +Sebastian Schuberth Shawn O. Pearce -Steven Grimm +Stefan Sperling +Stephen Boyd +Steven Grimm +Sven Verdoolaege +Sven Verdoolaege Tay Ray Chuan +Ted Percival Theodore Ts'o +Thomas Ackermann Thomas Rast +Timo Hirvonen +Toby Allsopp +Tom Grennan Tony Luck -Uwe Kleine-König +Trent Piepho +Trent Piepho Uwe Kleine-König +Uwe Kleine-König Uwe Kleine-König Uwe Kleine-König Uwe Kleine-König Ville Skyttä Vitaly "_Vi" Shukela +W. Trevor King William Pursell YOSHIFUJI Hideaki anonymous anonymous +İsmail Dönmez From f4f49e2258a250507baaa2c977a9fd7993ac07ad Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Sun, 14 Jul 2013 12:14:59 +0200 Subject: [PATCH 2/3] .mailmap: Combine more (email, name) to individual persons I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. It's mostly email mappings again. However we also have Nick Stokoe, who contributed as Nick Woolley. He changed his name, but kept the email. Signed-off-by: Stefan Beller Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- .mailmap | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 22d3d70791..9430d1489d 100644 --- a/.mailmap +++ b/.mailmap @@ -17,6 +17,7 @@ Alexey Shumkin Anders Kaseorg Anders Kaseorg Aneesh Kumar K.V +Ben Walton Bernt Hansen Brandon Casey Brian M. Carlson @@ -24,6 +25,8 @@ Bryan Larsen Bryan Larsen Cheng Renquan Chris Shoemaker +Chris Wright +Csaba Henk Dan Johnson Dana L. How Dana L. How @@ -44,8 +47,11 @@ Florian Achleitner Frank Lichtenheld Frank Lichtenheld -Fredrik Kuivinen +Fredrik Kuivinen Frédéric Heitzmann +Garry Dolley +Greg Price +Greg Price H. Merijn Brand H.Merijn Brand H. Peter Anvin H. Peter Anvin @@ -62,6 +68,7 @@ Jason Riedy Jay Soffian Jeff King Jeff Muizelaar +Jim Meyering Joachim Berdal Haga Johannes Schindelin Johannes Sixt @@ -95,6 +102,7 @@ Kirill Smelkov Knut Franke Lars Doelle Lars Doelle +Lars Noschinski Li Hong Linus Torvalds Linus Torvalds @@ -112,6 +120,7 @@ Martin Langhoff Martin von Zweigbergk Matt Draisey Matt Kraai +Matt McCutchen Matthias Kestenholz Matthias Urlichs Matthias Urlichs @@ -120,6 +129,7 @@ Michael J Gruber Michael W. Olson Michael Witten Michael Witten +Michal Rokos Michele Ballabio Miklos Vajna Namhyung Kim @@ -129,14 +139,19 @@ Nanako Shiraishi Nelson Elhage Nelson Elhage Nguyễn Thái Ngọc Duy +Nick Stokoe Nick Woolley +Nick Stokoe Nick Woolley Nicolas Morey-Chaisemartin Nicolas Morey-Chaisemartin +Nicolas Sebrecht Paolo Bonzini Pascal Obry Pascal Obry Pat Notz Paul Mackerras Paul Mackerras +Peter Baumann +Peter Baumann Peter Krefting Peter Krefting Petr Baudis @@ -149,17 +164,24 @@ Ralf Thielow Ramsay Allan Jones René Scharfe Robert Fitzsimons +Robert Shearman Robert Zeh Robin Rosenberg +Ryan Anderson Salikh Zakirov Sam Vilain Santi Béjar Sean Estabrooks Sebastian Schuberth +Seth Falcon Shawn O. Pearce +Stefan Naewe +Stefan Naewe Stefan Sperling Stephen Boyd Steven Grimm +Steven Walter +Steven Walter Sven Verdoolaege Sven Verdoolaege Tay Ray Chuan @@ -170,19 +192,25 @@ Thomas Rast Timo Hirvonen Toby Allsopp Tom Grennan +Tommi Virtanen +Tommi Virtanen +Tommy Thorn Tony Luck +Tor Arne Vestbø Trent Piepho Trent Piepho -Uwe Kleine-König -Uwe Kleine-König -Uwe Kleine-König -Uwe Kleine-König -Uwe Kleine-König -Ville Skyttä +Uwe Kleine-König +Uwe Kleine-König +Uwe Kleine-König +Uwe Kleine-König +Ville Skyttä Vitaly "_Vi" Shukela W. Trevor King William Pursell +YONETANI Tomokazu +YONETANI Tomokazu YOSHIFUJI Hideaki +# the two anonymous contributors are different persons: anonymous anonymous İsmail Dönmez From c07a6bc57255a2d00b41333f570b64cc36c70cfb Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 17 Jul 2013 22:16:31 +0200 Subject: [PATCH 3/3] .mailmap: combine more (email, name) to individual persons I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- .mailmap | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 9430d1489d..df8898ffd0 100644 --- a/.mailmap +++ b/.mailmap @@ -28,8 +28,7 @@ Chris Shoemaker Chris Wright Csaba Henk Dan Johnson -Dana L. How -Dana L. How +Dana L. How Daniel Barkalow David Brown David D. Kilzer @@ -52,6 +51,7 @@ Frédéric Heitzmann Garry Dolley Greg Price Greg Price +Heiko Voigt H. Merijn Brand H.Merijn Brand H. Peter Anvin H. Peter Anvin @@ -74,7 +74,8 @@ Johannes Schindelin Johannes Sixt Johannes Sixt Johannes Sixt -Jon Loeliger +Jon Loeliger +Jon Loeliger Jon Seymour Jonathan Nieder Jonathan del Strother @@ -175,10 +176,13 @@ Sean Estabrooks Sebastian Schuberth Seth Falcon Shawn O. Pearce +Simon Hausmann +Simon Hausmann Stefan Naewe Stefan Naewe Stefan Sperling Stephen Boyd +Steven Drake Steven Grimm Steven Walter Steven Walter