Re: [PATCH] .mailmap: Map email addresses to names

> 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@googlemail.com>
> ---

>  .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@bennee.com>
> +Alejandro R. Sedeño <asedeno@MIT.EDU> <asedeno@mit.edu>
>  Alexander Gavrilov <angavrilov@gmail.com>
> +Alex Bennée <kernel-hacker@bennee.com>
> +Alex Riesen <raa.lkml@gmail.com> <fork0@t-online.de>
> +Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain>
> +Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
> +Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
> +Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
>  Aneesh Kumar K.V <aneesh.kumar@gmail.com>
> +anonymous <linux@horizon.com>
> +anonymous <linux@horizon.net>
> +Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
>  Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
>  Cheng Renquan <crquan@gmail.com>
>  Chris Shoemaker <c.shoemaker@cox.net>
> -Dan Johnson <computerdruid@gmail.com>
>  Dana L. How <danahow@gmail.com>
>  Dana L. How <how@deathvalley.cswitch.com>
>  Daniel Barkalow <barkalow@iabervon.org>
> +Dan Johnson <computerdruid@gmail.com>
>  David D. Kilzer <ddkilzer@kilzer.net>
>  David Kågedal <davidk@lysator.liu.se>
> +David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
>  David S. Miller <davem@davemloft.net>
>  Deskin Miller <deskinm@umich.edu>
>  Dirk Süsserott <newsletter@dirk.my1.cc>
>  Eric S. Raymond <esr@thyrsus.com>
>  Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
> -Fredrik Kuivinen <freku045@student.liu.se>
> +Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
> +Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
> +Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
> +Frank Lichtenheld <frank@lichtenheld.de> <flichtenheld@astaro.com>
>  Frédéric Heitzmann <frederic.heitzmann@gmail.com>
> +Fredrik Kuivinen <freku045@student.liu.se>
> +Han-Wen Nienhuys <hanwen@google.com> Han-Wen Nienhuys <hanwen@xs4all.nl>
>  H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
> -H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
> -H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
> -H. Peter Anvin <hpa@trantor.hos.anvin.org>
>  Horst H. von Brand <vonbrand@inf.utfsm.cl>
> +H. Peter Anvin <hpa@zytor.com> <hpa@bonde.sc.orionmulti.com>
> +H. Peter Anvin <hpa@zytor.com> <hpa@smyrno.hos.anvin.org>
> +H. Peter Anvin <hpa@zytor.com> <hpa@tazenda.sc.orionmulti.com>
> +H. Peter Anvin <hpa@zytor.com> <hpa@trantor.hos.anvin.org>
>  İsmail Dönmez <ismail@pardus.org.tr>
>  Jakub Narębski <jnareb@gmail.com>
> -Jay Soffian <jaysoffian+git@gmail.com>
> +Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
> +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>
>  Jeff King <peff@peff.net> <peff@github.com>
>  Joachim Berdal Haga <cjhaga@fys.uio.no>
> +Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
>  Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
> -Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
>  Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
> +Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
> +Jonathan Nieder <jrnieder@gmail.com> <jrnieder@uchicago.edu>
>  Jon Loeliger <jdl@freescale.com>
>  Jon Seymour <jon@blackcubes.dyndns.org>
> -Jonathan Nieder <jrnieder@uchicago.edu>
>  Junio C Hamano <gitster@pobox.com> <gitster@pobox.com>
> -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@twinsun.com>
>  Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
>  Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
> +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>
> -Karl Hasselström <kha@treskal.com>
> -Kevin Leung <kevinlsk@gmail.com>
> +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>
> +Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
> +Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
> +Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
>  Kent Engstrom <kent@lysator.liu.se>
> +Kevin Leung <kevinlsk@gmail.com>
> +Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
> +Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
>  Lars Doelle <lars.doelle@on-line ! de>
>  Lars Doelle <lars.doelle@on-line.de>
>  Li Hong <leehong@pku.edu.cn>
> -Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
> -Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
> -Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
>  Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
> +Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
> +Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
>  Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org>
>  Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org.(none)>
> +Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
>  Lukas Sandström <lukass@etek.chalmers.se>
>  Marc-André Lureau <marcandre.lureau@gmail.com>
>  Mark Rada <marada@uwaterloo.ca>
>  Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
>  Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
> +Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
> +Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
> +Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
>  Michael Coleman <tutufan@gmail.com>
>  Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
> +Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>
> +Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
>  Michael W. Olson <mwolson@gnu.org>
>  Michele Ballabio <barra_cuda@katamail.com>
> +Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
> +Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
> +Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
>  Nanako Shiraishi <nanako3@bluebottle.com>
>  Nanako Shiraishi <nanako3@lavabit.com>
>  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>  <nico@fluxnic.net> <nico@cam.org>
> -Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
> +Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
> +Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
> +Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
> +Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
>  Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
> +Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
>  Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
> +Petr Baudis <pasky@ucw.cz> <xpasky@machine>
>  Philippe Bruhat <book@cpan.org>
>  Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
>  Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
>  René Scharfe <rene.scharfe@lsrfire.ath.cx>
>  Robert Fitzsimons <robfitz@273k.net>
>  Robert Zeh <robert.a.zeh@gmail.com>
> +Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
> +Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
>  Sam Vilain <sam@vilain.net>
> -Santi Béjar <sbejar@gmail.com>
> +Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
>  Sean Estabrooks <seanlkml@sympatico.ca>
> +Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
>  Shawn O. Pearce <spearce@spearce.org>
> -Steven Grimm <koreth@midwinter.com>
> +Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
> +Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
> +Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
> +Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
>  Tay Ray Chuan <rctay89@gmail.com>
>  Theodore Ts'o <tytso@mit.edu>
> +Thomas Ackermann <th.acker@arcor.de> <th.acker66@arcor.de>
>  Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
> +Timo Hirvonen <tihirvon@gmail.com> <tihirvon@ee.oulu.fi>
> +Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
>  Tony Luck <tony.luck@intel.com>
> -Uwe Kleine-König <Uwe_Zeisberger@digi.com>
> -Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
>  Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
> +Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
> +Uwe Kleine-König <Uwe_Zeisberger@digi.com>
>  Uwe Kleine-König <uzeisberger@io.fsforth.de>
>  Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
>  Ville Skyttä <scop@xemacs.org>
>  Vitaly "_Vi" Shukela <public_vi@tut.by>
>  William Pursell <bill.pursell@gmail.com>
>  YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> -anonymous <linux@horizon.com>
> -anonymous <linux@horizon.net>
> +