Stefan Beller <[email protected]> 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 <[email protected]> > ---
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 <[email protected]> > +Alejandro R. Sedeño <[email protected]> <[email protected]> > Alexander Gavrilov <[email protected]> > +Alex Bennée <[email protected]> > +Alex Riesen <[email protected]> <[email protected]> > +Alex Riesen <[email protected]> <[email protected]> > +Alex Riesen <[email protected]> <[email protected]> > +Anders Kaseorg <[email protected]> <[email protected]> > +Anders Kaseorg <[email protected]> <[email protected]> > Aneesh Kumar K.V <[email protected]> > +anonymous <[email protected]> > +anonymous <[email protected]> > +Brandon Casey <[email protected]> <[email protected]> > Brian M. Carlson <[email protected]> > Cheng Renquan <[email protected]> > Chris Shoemaker <[email protected]> > -Dan Johnson <[email protected]> > Dana L. How <[email protected]> > Dana L. How <[email protected]> > Daniel Barkalow <[email protected]> > +Dan Johnson <[email protected]> > David D. Kilzer <[email protected]> > David Kågedal <[email protected]> > +David Reiss <[email protected]> <dreiss@dreiss-vmware.(none)> > David S. Miller <[email protected]> > Deskin Miller <[email protected]> > Dirk Süsserott <[email protected]> > Eric S. Raymond <[email protected]> > Erik Faye-Lund <[email protected]> <[email protected]> > -Fredrik Kuivinen <[email protected]> > +Florian Achleitner <[email protected]> > <[email protected]> > +Franck Bui-Huu <[email protected]> <[email protected]> > +Frank Lichtenheld <[email protected]> <[email protected]> > +Frank Lichtenheld <[email protected]> <[email protected]> > Frédéric Heitzmann <[email protected]> > +Fredrik Kuivinen <[email protected]> > +Han-Wen Nienhuys <[email protected]> Han-Wen Nienhuys <[email protected]> > H. Merijn Brand <[email protected]> H.Merijn Brand <[email protected]> > -H. Peter Anvin <[email protected]> > -H. Peter Anvin <[email protected]> > -H. Peter Anvin <[email protected]> > Horst H. von Brand <[email protected]> > +H. Peter Anvin <[email protected]> <[email protected]> > +H. Peter Anvin <[email protected]> <[email protected]> > +H. Peter Anvin <[email protected]> <[email protected]> > +H. Peter Anvin <[email protected]> <[email protected]> > İsmail Dönmez <[email protected]> > Jakub Narębski <[email protected]> > -Jay Soffian <[email protected]> > +Jay Soffian <[email protected]> <[email protected]> > +J. Bruce Fields <[email protected]> <[email protected]> > +J. Bruce Fields <[email protected]> <[email protected]> > +J. Bruce Fields <[email protected]> <[email protected]> > Jeff King <[email protected]> <[email protected]> > Joachim Berdal Haga <[email protected]> > +Johannes Schindelin <[email protected]> <[email protected]> > Johannes Sixt <[email protected]> <[email protected]> > -Johannes Sixt <[email protected]> <[email protected]> > Johannes Sixt <[email protected]> <[email protected]> > +Johannes Sixt <[email protected]> <[email protected]> > +Jonathan Nieder <[email protected]> <[email protected]> > Jon Loeliger <[email protected]> > Jon Seymour <[email protected]> > -Jonathan Nieder <[email protected]> > Junio C Hamano <[email protected]> <[email protected]> > -Junio C Hamano <[email protected]> <[email protected]> > -Junio C Hamano <[email protected]> <[email protected]> > -Junio C Hamano <[email protected]> <[email protected]> > Junio C Hamano <[email protected]> <[email protected]> > Junio C Hamano <[email protected]> <[email protected]> > +Junio C Hamano <[email protected]> <[email protected]> > +Junio C Hamano <[email protected]> <[email protected]> > Junio C Hamano <[email protected]> <[email protected]> > -Karl Hasselström <[email protected]> > -Kevin Leung <[email protected]> > +Junio C Hamano <[email protected]> <[email protected]> > +Karl Wiberg <[email protected]> Karl Hasselström <[email protected]> > +Karl Wiberg <[email protected]> Karl Hasselström > <[email protected]> > +Kay Sievers <[email protected]> <kay@mam.(none)> > +Kay Sievers <[email protected]> <[email protected]> > +Keith Cascio <[email protected]> <[email protected]> > Kent Engstrom <[email protected]> > +Kevin Leung <[email protected]> > +Kirill Smelkov <[email protected]> <[email protected]> > +Kirill Smelkov <[email protected]> <[email protected]> > Lars Doelle <lars.doelle@on-line ! de> > Lars Doelle <[email protected]> > Li Hong <[email protected]> > -Linus Torvalds <[email protected]> > <[email protected]> > -Linus Torvalds <[email protected]> <[email protected]> > -Linus Torvalds <[email protected]> <[email protected]> > Linus Torvalds <[email protected]> <[email protected]> > +Linus Torvalds <[email protected]> <[email protected]> > +Linus Torvalds <[email protected]> <[email protected]> > Linus Torvalds <[email protected]> <[email protected]> > Linus Torvalds <[email protected]> > <[email protected].(none)> > +Linus Torvalds <[email protected]> > <[email protected]> > Lukas Sandström <[email protected]> > Marc-André Lureau <[email protected]> > Mark Rada <[email protected]> > Martin Langhoff <[email protected]> <[email protected]> > Martin von Zweigbergk <[email protected]> > <[email protected]> > +Matthias Kestenholz <[email protected]> <[email protected]> > +Matthias Urlichs <[email protected]> <smurf@kiste.(none)> > +Matthias Urlichs <[email protected]> <[email protected]> > Michael Coleman <[email protected]> > Michael J Gruber <[email protected]> > <[email protected]> > +Michael Witten <[email protected]> <[email protected]> > +Michael Witten <[email protected]> <[email protected]> > Michael W. Olson <[email protected]> > Michele Ballabio <[email protected]> > +Miklos Vajna <[email protected]> <[email protected]> > +Namhyung Kim <[email protected]> <[email protected]> > +Namhyung Kim <[email protected]> <[email protected]> > Nanako Shiraishi <[email protected]> > Nanako Shiraishi <[email protected]> > Nguyễn Thái Ngọc Duy <[email protected]> > <[email protected]> <[email protected]> > -Peter Krefting <[email protected]> > <[email protected]> > +Pascal Obry <[email protected]> <[email protected]> > +Pascal Obry <[email protected]> <[email protected]> > +Paul Mackerras <[email protected]> <paulus@dorrigo.(none)> > +Paul Mackerras <[email protected]> <paulus@pogo.(none)> > Peter Krefting <[email protected]> <[email protected]> > +Peter Krefting <[email protected]> > <[email protected]> > Petr Baudis <[email protected]> <[email protected]> > +Petr Baudis <[email protected]> <xpasky@machine> > Philippe Bruhat <[email protected]> > Ralf Thielow <[email protected]> <[email protected]> > Ramsay Allan Jones <[email protected]> > René Scharfe <[email protected]> > Robert Fitzsimons <[email protected]> > Robert Zeh <[email protected]> > +Robin Rosenberg <[email protected]> > <[email protected]> > +Salikh Zakirov <[email protected]> <[email protected]> > Sam Vilain <[email protected]> > -Santi Béjar <[email protected]> > +Santi Béjar <[email protected]> <[email protected]> > Sean Estabrooks <[email protected]> > +Sebastian Schuberth <[email protected]> <[email protected]> > Shawn O. Pearce <[email protected]> > -Steven Grimm <[email protected]> > +Stephen Boyd <[email protected]> <[email protected]> > +Steven Grimm <[email protected]> <[email protected]> > +Sven Verdoolaege <[email protected]> <[email protected]> > +Sven Verdoolaege <[email protected]> <[email protected]> > Tay Ray Chuan <[email protected]> > Theodore Ts'o <[email protected]> > +Thomas Ackermann <[email protected]> <[email protected]> > Thomas Rast <[email protected]> <[email protected]> > +Timo Hirvonen <[email protected]> <[email protected]> > +Toby Allsopp <[email protected]> <[email protected]> > Tony Luck <[email protected]> > -Uwe Kleine-König <[email protected]> > -Uwe Kleine-König <[email protected]> > Uwe Kleine-König <[email protected]> > +Uwe Kleine-König <[email protected]> > +Uwe Kleine-König <[email protected]> > Uwe Kleine-König <[email protected]> > Uwe Kleine-König <[email protected]> > Ville Skyttä <[email protected]> > Vitaly "_Vi" Shukela <[email protected]> > William Pursell <[email protected]> > YOSHIFUJI Hideaki <[email protected]> > -anonymous <[email protected]> > -anonymous <[email protected]> > + -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
