From: Junio C Hamano Date: Fri, 12 Jul 2013 16:31:31 GMT Subject: Re: [PATCH] .mailmap: Map email addresses to names Message-ID: <7vzjtrn3j0.fsf@alter.siamese.dyndns.org> In-Reply-To: <1373629769-23647-2-git-send-email-stefanbeller@googlemail.com> Stefan Beller writes: > 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 > --- 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. > .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 > +Alejandro R. Sedeño > Alexander Gavrilov > +Alex Bennée > +Alex Riesen > +Alex Riesen > +Alex Riesen > +Anders Kaseorg > +Anders Kaseorg > Aneesh Kumar K.V > +anonymous > +anonymous > +Brandon Casey > Brian M. Carlson > Cheng Renquan > Chris Shoemaker > -Dan Johnson > Dana L. How > Dana L. How > Daniel Barkalow > +Dan Johnson > David D. Kilzer > David Kågedal > +David Reiss > David S. Miller > Deskin Miller > Dirk Süsserott > Eric S. Raymond > Erik Faye-Lund > -Fredrik Kuivinen > +Florian Achleitner > +Franck Bui-Huu > +Frank Lichtenheld > +Frank Lichtenheld > Frédéric Heitzmann > +Fredrik Kuivinen > +Han-Wen Nienhuys Han-Wen Nienhuys > H. Merijn Brand H.Merijn Brand > -H. Peter Anvin > -H. Peter Anvin > -H. Peter Anvin > Horst H. von Brand > +H. Peter Anvin > +H. Peter Anvin > +H. Peter Anvin > +H. Peter Anvin > İsmail Dönmez > Jakub Narębski > -Jay Soffian > +Jay Soffian > +J. Bruce Fields > +J. Bruce Fields > +J. Bruce Fields > Jeff King > Joachim Berdal Haga > +Johannes Schindelin > Johannes Sixt > -Johannes Sixt > Johannes Sixt > +Johannes Sixt > +Jonathan Nieder > Jon Loeliger > Jon Seymour > -Jonathan Nieder > 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 > +Kay Sievers > +Kay Sievers > +Keith Cascio > Kent Engstrom > +Kevin Leung > +Kirill Smelkov > +Kirill Smelkov > Lars Doelle > Lars Doelle > Li Hong > -Linus Torvalds > -Linus Torvalds > -Linus Torvalds > Linus Torvalds > +Linus Torvalds > +Linus Torvalds > Linus Torvalds > Linus Torvalds > +Linus Torvalds > Lukas Sandström > Marc-André Lureau > Mark Rada > Martin Langhoff > Martin von Zweigbergk > +Matthias Kestenholz > +Matthias Urlichs > +Matthias Urlichs > Michael Coleman > Michael J Gruber > +Michael Witten > +Michael Witten > Michael W. Olson > Michele Ballabio > +Miklos Vajna > +Namhyung Kim > +Namhyung Kim > Nanako Shiraishi > Nanako Shiraishi > Nguyễn Thái Ngọc Duy > > -Peter Krefting > +Pascal Obry > +Pascal Obry > +Paul Mackerras > +Paul Mackerras > Peter Krefting > +Peter Krefting > Petr Baudis > +Petr Baudis > Philippe Bruhat > Ralf Thielow > Ramsay Allan Jones > René Scharfe > Robert Fitzsimons > Robert Zeh > +Robin Rosenberg > +Salikh Zakirov > Sam Vilain > -Santi Béjar > +Santi Béjar > Sean Estabrooks > +Sebastian Schuberth > Shawn O. Pearce > -Steven Grimm > +Stephen Boyd > +Steven Grimm > +Sven Verdoolaege > +Sven Verdoolaege > Tay Ray Chuan > Theodore Ts'o > +Thomas Ackermann > Thomas Rast > +Timo Hirvonen > +Toby Allsopp > Tony Luck > -Uwe Kleine-König > -Uwe Kleine-König > 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 > William Pursell > YOSHIFUJI Hideaki > -anonymous > -anonymous > +