Stefan Beller <stefanbeller@xxxxxxxxxxxxxx> 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 <stefanbeller@xxxxxxxxxxxxxx>
> ---
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 <kernel-hacker@xxxxxxxxxx>
> +Alejandro R. Sedeño <asedeno@xxxxxxx> <asedeno@xxxxxxx>
> Alexander Gavrilov <angavrilov@xxxxxxxxx>
> +Alex Bennée <kernel-hacker@xxxxxxxxxx>
> +Alex Riesen <raa.lkml@xxxxxxxxx> <fork0@xxxxxxxxxxx>
> +Alex Riesen <raa.lkml@xxxxxxxxx> <raa@limbo.localdomain>
> +Alex Riesen <raa.lkml@xxxxxxxxx> <raa@xxxxxxxxxx>
> +Anders Kaseorg <andersk@xxxxxxx> <andersk@xxxxxxxxxxx>
> +Anders Kaseorg <andersk@xxxxxxx> <andersk@xxxxxxx>
> Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxx>
> +anonymous <linux@xxxxxxxxxxx>
> +anonymous <linux@xxxxxxxxxxx>
> +Brandon Casey <drafnel@xxxxxxxxx> <casey@xxxxxxxxxxxxxxx>
> Brian M. Carlson <sandals@xxxxxxxxxxxxxxxxxxxxxxx>
> Cheng Renquan <crquan@xxxxxxxxx>
> Chris Shoemaker <c.shoemaker@xxxxxxx>
> -Dan Johnson <computerdruid@xxxxxxxxx>
> Dana L. How <danahow@xxxxxxxxx>
> Dana L. How <how@xxxxxxxxxxxxxxxxxxxxxxx>
> Daniel Barkalow <barkalow@xxxxxxxxxxxx>
> +Dan Johnson <computerdruid@xxxxxxxxx>
> David D. Kilzer <ddkilzer@xxxxxxxxxx>
> David Kågedal <davidk@xxxxxxxxxxxxxx>
> +David Reiss <dreiss@xxxxxxxxxxxx> <dreiss@dreiss-vmware.(none)>
> David S. Miller <davem@xxxxxxxxxxxxx>
> Deskin Miller <deskinm@xxxxxxxxx>
> Dirk Süsserott <newsletter@xxxxxxxxxxx>
> Eric S. Raymond <esr@xxxxxxxxxxx>
> Erik Faye-Lund <kusmabite@xxxxxxxxx> <kusmabite@xxxxxxxxxxxxxx>
> -Fredrik Kuivinen <freku045@xxxxxxxxxxxxxx>
> +Florian Achleitner <florian.achleitner.2.6.31@xxxxxxxxx> <florian.achleitner2.6.31@xxxxxxxxx>
> +Franck Bui-Huu <vagabon.xyz@xxxxxxxxx> <fbuihuu@xxxxxxxxx>
> +Frank Lichtenheld <frank@xxxxxxxxxxxxxx> <djpig@xxxxxxxxxx>
> +Frank Lichtenheld <frank@xxxxxxxxxxxxxx> <flichtenheld@xxxxxxxxxx>
> Frédéric Heitzmann <frederic.heitzmann@xxxxxxxxx>
> +Fredrik Kuivinen <freku045@xxxxxxxxxxxxxx>
> +Han-Wen Nienhuys <hanwen@xxxxxxxxxx> Han-Wen Nienhuys <hanwen@xxxxxxxxx>
> H. Merijn Brand <h.m.brand@xxxxxxxxx> H.Merijn Brand <h.m.brand@xxxxxxxxx>
> -H. Peter Anvin <hpa@xxxxxxxxxxxxxxxxxxxxxxx>
> -H. Peter Anvin <hpa@xxxxxxxxxxxxxxxxxxxxxxxxx>
> -H. Peter Anvin <hpa@xxxxxxxxxxxxxxxxxxxxx>
> Horst H. von Brand <vonbrand@xxxxxxxxxxxx>
> +H. Peter Anvin <hpa@xxxxxxxxx> <hpa@xxxxxxxxxxxxxxxxxxxxxxx>
> +H. Peter Anvin <hpa@xxxxxxxxx> <hpa@xxxxxxxxxxxxxxxxxxxx>
> +H. Peter Anvin <hpa@xxxxxxxxx> <hpa@xxxxxxxxxxxxxxxxxxxxxxxxx>
> +H. Peter Anvin <hpa@xxxxxxxxx> <hpa@xxxxxxxxxxxxxxxxxxxxx>
> İsmail Dönmez <ismail@xxxxxxxxxxxxx>
> Jakub Narębski <jnareb@xxxxxxxxx>
> -Jay Soffian <jaysoffian+git@xxxxxxxxx>
> +Jay Soffian <jaysoffian@xxxxxxxxx> <jaysoffian+git@xxxxxxxxx>
> +J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxx>
> +J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxxxxxxx>
> +J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxx>
> Jeff King <peff@xxxxxxxx> <peff@xxxxxxxxxx>
> Joachim Berdal Haga <cjhaga@xxxxxxxxxx>
> +Johannes Schindelin <Johannes.Schindelin@xxxxxx> <johannes.schindelin@xxxxxx>
> Johannes Sixt <j6t@xxxxxxxx> <johannes.sixt@xxxxxxxxxx>
> -Johannes Sixt <j6t@xxxxxxxx> <j.sixt@xxxxxxxxxxxxx>
> Johannes Sixt <j6t@xxxxxxxx> <J.Sixt@xxxxxxxxxxxxx>
> +Johannes Sixt <j6t@xxxxxxxx> <j.sixt@xxxxxxxxxxxxx>
> +Jonathan Nieder <jrnieder@xxxxxxxxx> <jrnieder@xxxxxxxxxxxx>
> Jon Loeliger <jdl@xxxxxxxxxxxxx>
> Jon Seymour <jon@xxxxxxxxxxxxxxxxxxxxx>
> -Jonathan Nieder <jrnieder@xxxxxxxxxxxx>
> Junio C Hamano <gitster@xxxxxxxxx> <gitster@xxxxxxxxx>
> -Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxx>
> -Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxxxx>
> -Junio C Hamano <gitster@xxxxxxxxx> <junkio@xxxxxxxxxxx>
> Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxxxxxxxx>
> Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxxx>
> +Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxx>
> +Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxxxx>
> Junio C Hamano <gitster@xxxxxxxxx> <junkio@xxxxxxx>
> -Karl Hasselström <kha@xxxxxxxxxxx>
> -Kevin Leung <kevinlsk@xxxxxxxxx>
> +Junio C Hamano <gitster@xxxxxxxxx> <junkio@xxxxxxxxxxx>
> +Karl Wiberg <kha@xxxxxxxxxxx> Karl Hasselström <kha@xxxxxxxxxxx>
> +Karl Wiberg <kha@xxxxxxxxxxx> Karl Hasselström <kha@xxxxxxxxxxxxxxxxxxxxxxxxx>
> +Kay Sievers <kay.sievers@xxxxxxxx> <kay@mam.(none)>
> +Kay Sievers <kay.sievers@xxxxxxxx> <kay.sievers@xxxxxxx>
> +Keith Cascio <keith@xxxxxxxxxxx> <keith@xxxxxxxxxxx>
> Kent Engstrom <kent@xxxxxxxxxxxxxx>
> +Kevin Leung <kevinlsk@xxxxxxxxx>
> +Kirill Smelkov <kirr@xxxxxxxxxxxxxx> <kirr@xxxxxxxxxxxxxxxxxxx>
> +Kirill Smelkov <kirr@xxxxxxxxxxxxxx> <kirr@xxxxxxxxxx>
> Lars Doelle <lars.doelle@on-line ! de>
> Lars Doelle <lars.doelle@xxxxxxxxxx>
> Li Hong <leehong@xxxxxxxxxx>
> -Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxxxxxxxxxxxxxxxx>
> -Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxx>
> -Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxx>
> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxx>
> +Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxx>
> +Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxx>
> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxxxxx>
> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxxxxx.(none)>
> +Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxxxxxxxxxxxxxxxx>
> Lukas Sandström <lukass@xxxxxxxxxxxxxxxx>
> Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
> Mark Rada <marada@xxxxxxxxxxxx>
> Martin Langhoff <martin@xxxxxxxxxx> <martin@xxxxxxxxxxxxxxx>
> Martin von Zweigbergk <martinvonz@xxxxxxxxx> <martin.von.zweigbergk@xxxxxxxxx>
> +Matthias Kestenholz <matthias@xxxxxxxxxxx> <mk@xxxxxxxxxxx>
> +Matthias Urlichs <matthias@xxxxxxxxxx> <smurf@kiste.(none)>
> +Matthias Urlichs <matthias@xxxxxxxxxx> <smurf@xxxxxxxxxxxxxx>
> Michael Coleman <tutufan@xxxxxxxxx>
> Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> <michaeljgruber+gmane@xxxxxxxxxxx>
> +Michael Witten <mfwitten@xxxxxxxxx> <mfwitten@xxxxxxx>
> +Michael Witten <mfwitten@xxxxxxxxx> <mfwitten@xxxxxxx>
> Michael W. Olson <mwolson@xxxxxxx>
> Michele Ballabio <barra_cuda@xxxxxxxxxxxx>
> +Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> <vmiklos@xxxxxxx>
> +Namhyung Kim <namhyung@xxxxxxxxx> <namhyung@xxxxxxxxxx>
> +Namhyung Kim <namhyung@xxxxxxxxx> <namhyung.kim@xxxxxxx>
> Nanako Shiraishi <nanako3@xxxxxxxxxxxxxx>
> Nanako Shiraishi <nanako3@xxxxxxxxxxx>
> Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
> <nico@xxxxxxxxxxx> <nico@xxxxxxx>
> -Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> +Pascal Obry <pascal@xxxxxxxx> <pascal.obry@xxxxxxxxx>
> +Pascal Obry <pascal@xxxxxxxx> <pascal.obry@xxxxxxxxxx>
> +Paul Mackerras <paulus@xxxxxxxxx> <paulus@dorrigo.(none)>
> +Paul Mackerras <paulus@xxxxxxxxx> <paulus@pogo.(none)>
> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxx>
> +Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Petr Baudis <pasky@xxxxxx> <pasky@xxxxxxx>
> +Petr Baudis <pasky@xxxxxx> <xpasky@machine>
> Philippe Bruhat <book@xxxxxxxx>
> Ralf Thielow <ralf.thielow@xxxxxxxxx> <ralf.thielow@xxxxxxxxxxxxxx>
> Ramsay Allan Jones <ramsay@xxxxxxxxxxxxxxxxxxx>
> René Scharfe <rene.scharfe@xxxxxxxxxxxxxx>
> Robert Fitzsimons <robfitz@xxxxxxxx>
> Robert Zeh <robert.a.zeh@xxxxxxxxx>
> +Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> <robin.rosenberg.lists@xxxxxxxxxx>
> +Salikh Zakirov <salikh.zakirov@xxxxxxxxx> <Salikh.Zakirov@xxxxxxxxx>
> Sam Vilain <sam@xxxxxxxxxx>
> -Santi Béjar <sbejar@xxxxxxxxx>
> +Santi Béjar <santi@xxxxxxxxxxx> <sbejar@xxxxxxxxx>
> Sean Estabrooks <seanlkml@xxxxxxxxxxxx>
> +Sebastian Schuberth <sschuberth@xxxxxxxxx> <sschuberth@xxxxxxxxxxxxxxxxx>
> Shawn O. Pearce <spearce@xxxxxxxxxxx>
> -Steven Grimm <koreth@xxxxxxxxxxxxx>
> +Stephen Boyd <bebarino@xxxxxxxxx> <sboyd@xxxxxxxxxxxxxx>
> +Steven Grimm <koreth@xxxxxxxxxxxxx> <sgrimm@sgrimm-mbp.local>
> +Sven Verdoolaege <skimo@xxxxxxxxxx> <skimo@xxxxxxxx>
> +Sven Verdoolaege <skimo@xxxxxxxxxx> <Sven.Verdoolaege@xxxxxxxxxxxxxxxxx>
> Tay Ray Chuan <rctay89@xxxxxxxxx>
> Theodore Ts'o <tytso@xxxxxxx>
> +Thomas Ackermann <th.acker@xxxxxxxx> <th.acker66@xxxxxxxx>
> Thomas Rast <trast@xxxxxxxxxxx> <trast@xxxxxxxxxxxxxxx>
> +Timo Hirvonen <tihirvon@xxxxxxxxx> <tihirvon@xxxxxxxxxx>
> +Toby Allsopp <Toby.Allsopp@xxxxxxxxxxxx> <toby.allsopp@xxxxxxxxxxxx>
> Tony Luck <tony.luck@xxxxxxxxx>
> -Uwe Kleine-König <Uwe_Zeisberger@xxxxxxxx>
> -Uwe Kleine-König <Uwe.Kleine-Koenig@xxxxxxxx>
> Uwe Kleine-König <ukleinek@xxxxxxxxxxxxxxxxxxxxxxxxxx>
> +Uwe Kleine-König <Uwe.Kleine-Koenig@xxxxxxxx>
> +Uwe Kleine-König <Uwe_Zeisberger@xxxxxxxx>
> Uwe Kleine-König <uzeisberger@xxxxxxxxxxxxx>
> Uwe Kleine-König <zeisberg@xxxxxxxxxxxxxxxxxxxxxxxxxx>
> Ville Skyttä <scop@xxxxxxxxxx>
> Vitaly "_Vi" Shukela <public_vi@xxxxxx>
> William Pursell <bill.pursell@xxxxxxxxx>
> YOSHIFUJI Hideaki <yoshfuji@xxxxxxxxxxxxxx>
> -anonymous <linux@xxxxxxxxxxx>
> -anonymous <linux@xxxxxxxxxxx>
> +
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html