Stefan Beller <stefanbel...@googlemail.com> 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 <stefanbel...@googlemail.com>
> ---
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-hac...@bennee.com>
> +Alejandro R. Sedeño <ased...@mit.edu> <ased...@mit.edu>
> Alexander Gavrilov <angavri...@gmail.com>
> +Alex Bennée <kernel-hac...@bennee.com>
> +Alex Riesen <raa.l...@gmail.com> <fo...@t-online.de>
> +Alex Riesen <raa.l...@gmail.com> <raa@limbo.localdomain>
> +Alex Riesen <raa.l...@gmail.com> <r...@steel.home>
> +Anders Kaseorg <ande...@mit.edu> <ande...@ksplice.com>
> +Anders Kaseorg <ande...@mit.edu> <ande...@mit.edu>
> Aneesh Kumar K.V <aneesh.ku...@gmail.com>
> +anonymous <li...@horizon.com>
> +anonymous <li...@horizon.net>
> +Brandon Casey <draf...@gmail.com> <ca...@nrlssc.navy.mil>
> Brian M. Carlson <sand...@crustytoothpaste.ath.cx>
> Cheng Renquan <crq...@gmail.com>
> Chris Shoemaker <c.shoema...@cox.net>
> -Dan Johnson <computerdr...@gmail.com>
> Dana L. How <dana...@gmail.com>
> Dana L. How <h...@deathvalley.cswitch.com>
> Daniel Barkalow <barka...@iabervon.org>
> +Dan Johnson <computerdr...@gmail.com>
> David D. Kilzer <ddkil...@kilzer.net>
> David Kågedal <dav...@lysator.liu.se>
> +David Reiss <dre...@facebook.com> <dreiss@dreiss-vmware.(none)>
> David S. Miller <da...@davemloft.net>
> Deskin Miller <desk...@umich.edu>
> Dirk Süsserott <newslet...@dirk.my1.cc>
> Eric S. Raymond <e...@thyrsus.com>
> Erik Faye-Lund <kusmab...@gmail.com> <kusmab...@googlemail.com>
> -Fredrik Kuivinen <freku...@student.liu.se>
> +Florian Achleitner <florian.achleitner.2.6...@gmail.com>
> <florian.achleitner2.6...@gmail.com>
> +Franck Bui-Huu <vagabon....@gmail.com> <fbui...@gmail.com>
> +Frank Lichtenheld <fr...@lichtenheld.de> <dj...@debian.org>
> +Frank Lichtenheld <fr...@lichtenheld.de> <flichtenh...@astaro.com>
> Frédéric Heitzmann <frederic.heitzm...@gmail.com>
> +Fredrik Kuivinen <freku...@student.liu.se>
> +Han-Wen Nienhuys <han...@google.com> Han-Wen Nienhuys <han...@xs4all.nl>
> H. Merijn Brand <h.m.br...@xs4all.nl> H.Merijn Brand <h.m.br...@xs4all.nl>
> -H. Peter Anvin <h...@bonde.sc.orionmulti.com>
> -H. Peter Anvin <h...@tazenda.sc.orionmulti.com>
> -H. Peter Anvin <h...@trantor.hos.anvin.org>
> Horst H. von Brand <vonbr...@inf.utfsm.cl>
> +H. Peter Anvin <h...@zytor.com> <h...@bonde.sc.orionmulti.com>
> +H. Peter Anvin <h...@zytor.com> <h...@smyrno.hos.anvin.org>
> +H. Peter Anvin <h...@zytor.com> <h...@tazenda.sc.orionmulti.com>
> +H. Peter Anvin <h...@zytor.com> <h...@trantor.hos.anvin.org>
> İsmail Dönmez <ism...@pardus.org.tr>
> Jakub Narębski <jna...@gmail.com>
> -Jay Soffian <jaysoffian+...@gmail.com>
> +Jay Soffian <jaysoff...@gmail.com> <jaysoffian+...@gmail.com>
> +J. Bruce Fields <bfie...@citi.umich.edu> <bfie...@fieldses.org>
> +J. Bruce Fields <bfie...@citi.umich.edu> <bfie...@pig.linuxdev.us.dell.com>
> +J. Bruce Fields <bfie...@citi.umich.edu> <bfie...@puzzle.fieldses.org>
> Jeff King <p...@peff.net> <p...@github.com>
> Joachim Berdal Haga <cjh...@fys.uio.no>
> +Johannes Schindelin <johannes.schinde...@gmx.de> <johannes.schinde...@gmx.de>
> Johannes Sixt <j...@kdbg.org> <johannes.s...@telecom.at>
> -Johannes Sixt <j...@kdbg.org> <j.s...@viscovery.net>
> Johannes Sixt <j...@kdbg.org> <j.s...@eudaptics.com>
> +Johannes Sixt <j...@kdbg.org> <j.s...@viscovery.net>
> +Jonathan Nieder <jrnie...@gmail.com> <jrnie...@uchicago.edu>
> Jon Loeliger <j...@freescale.com>
> Jon Seymour <j...@blackcubes.dyndns.org>
> -Jonathan Nieder <jrnie...@uchicago.edu>
> Junio C Hamano <gits...@pobox.com> <gits...@pobox.com>
> -Junio C Hamano <gits...@pobox.com> <ju...@pobox.com>
> -Junio C Hamano <gits...@pobox.com> <ju...@twinsun.com>
> -Junio C Hamano <gits...@pobox.com> <jun...@twinsun.com>
> Junio C Hamano <gits...@pobox.com> <ju...@hera.kernel.org>
> Junio C Hamano <gits...@pobox.com> <ju...@kernel.org>
> +Junio C Hamano <gits...@pobox.com> <ju...@pobox.com>
> +Junio C Hamano <gits...@pobox.com> <ju...@twinsun.com>
> Junio C Hamano <gits...@pobox.com> <jun...@cox.net>
> -Karl Hasselström <k...@treskal.com>
> -Kevin Leung <kevin...@gmail.com>
> +Junio C Hamano <gits...@pobox.com> <jun...@twinsun.com>
> +Karl Wiberg <k...@treskal.com> Karl Hasselström <k...@treskal.com>
> +Karl Wiberg <k...@treskal.com> Karl Hasselström
> <k...@yoghurt.hemma.treskal.com>
> +Kay Sievers <kay.siev...@vrfy.org> <kay@mam.(none)>
> +Kay Sievers <kay.siev...@vrfy.org> <kay.siev...@suse.de>
> +Keith Cascio <ke...@cs.ucla.edu> <ke...@cs.ucla.edu>
> Kent Engstrom <k...@lysator.liu.se>
> +Kevin Leung <kevin...@gmail.com>
> +Kirill Smelkov <k...@navytux.spb.ru> <k...@landau.phys.spbu.ru>
> +Kirill Smelkov <k...@navytux.spb.ru> <k...@mns.spb.ru>
> Lars Doelle <lars.doelle@on-line ! de>
> Lars Doelle <lars.doe...@on-line.de>
> Li Hong <leeh...@pku.edu.cn>
> -Linus Torvalds <torva...@linux-foundation.org>
> <torva...@woody.linux-foundation.org>
> -Linus Torvalds <torva...@linux-foundation.org> <torva...@osdl.org>
> -Linus Torvalds <torva...@linux-foundation.org> <torva...@g5.osdl.org>
> Linus Torvalds <torva...@linux-foundation.org> <torva...@evo.osdl.org>
> +Linus Torvalds <torva...@linux-foundation.org> <torva...@g5.osdl.org>
> +Linus Torvalds <torva...@linux-foundation.org> <torva...@osdl.org>
> Linus Torvalds <torva...@linux-foundation.org> <torva...@ppc970.osdl.org>
> Linus Torvalds <torva...@linux-foundation.org>
> <torva...@ppc970.osdl.org.(none)>
> +Linus Torvalds <torva...@linux-foundation.org>
> <torva...@woody.linux-foundation.org>
> Lukas Sandström <luk...@etek.chalmers.se>
> Marc-André Lureau <marcandre.lur...@gmail.com>
> Mark Rada <mar...@uwaterloo.ca>
> Martin Langhoff <mar...@laptop.org> <mar...@catalyst.net.nz>
> Martin von Zweigbergk <martinv...@gmail.com>
> <martin.von.zweigbe...@gmail.com>
> +Matthias Kestenholz <matth...@spinlock.ch> <m...@spinlock.ch>
> +Matthias Urlichs <matth...@urlichs.de> <smurf@kiste.(none)>
> +Matthias Urlichs <matth...@urlichs.de> <sm...@smurf.noris.de>
> Michael Coleman <tutu...@gmail.com>
> Michael J Gruber <g...@drmicha.warpmail.net>
> <michaeljgruber+gm...@fastmail.fm>
> +Michael Witten <mfwit...@gmail.com> <mfwit...@mit.edu>
> +Michael Witten <mfwit...@gmail.com> <mfwit...@mit.edu>
> Michael W. Olson <mwol...@gnu.org>
> Michele Ballabio <barra_c...@katamail.com>
> +Miklos Vajna <vmik...@frugalware.org> <vmik...@suse.cz>
> +Namhyung Kim <namhy...@gmail.com> <namhy...@kernel.org>
> +Namhyung Kim <namhy...@gmail.com> <namhyung....@lge.com>
> Nanako Shiraishi <nana...@bluebottle.com>
> Nanako Shiraishi <nana...@lavabit.com>
> Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
> <n...@fluxnic.net> <n...@cam.org>
> -Peter Krefting <pe...@softwolves.pp.se>
> <pe...@svarten.intern.softwolves.pp.se>
> +Pascal Obry <pas...@obry.net> <pascal.o...@gmail.com>
> +Pascal Obry <pas...@obry.net> <pascal.o...@wanadoo.fr>
> +Paul Mackerras <pau...@samba.org> <paulus@dorrigo.(none)>
> +Paul Mackerras <pau...@samba.org> <paulus@pogo.(none)>
> Peter Krefting <pe...@softwolves.pp.se> <pe...@softwolves.pp.se>
> +Peter Krefting <pe...@softwolves.pp.se>
> <pe...@svarten.intern.softwolves.pp.se>
> Petr Baudis <pa...@ucw.cz> <pa...@suse.cz>
> +Petr Baudis <pa...@ucw.cz> <xpasky@machine>
> Philippe Bruhat <b...@cpan.org>
> Ralf Thielow <ralf.thie...@gmail.com> <ralf.thie...@googlemail.com>
> Ramsay Allan Jones <ram...@ramsay1.demon.co.uk>
> René Scharfe <rene.scha...@lsrfire.ath.cx>
> Robert Fitzsimons <robf...@273k.net>
> Robert Zeh <robert.a....@gmail.com>
> +Robin Rosenberg <robin.rosenb...@dewire.com>
> <robin.rosenberg.li...@dewire.com>
> +Salikh Zakirov <salikh.zaki...@gmail.com> <salikh.zaki...@intel.com>
> Sam Vilain <s...@vilain.net>
> -Santi Béjar <sbe...@gmail.com>
> +Santi Béjar <sa...@agolina.net> <sbe...@gmail.com>
> Sean Estabrooks <seanl...@sympatico.ca>
> +Sebastian Schuberth <sschube...@gmail.com> <sschube...@visageimaging.com>
> Shawn O. Pearce <spea...@spearce.org>
> -Steven Grimm <kor...@midwinter.com>
> +Stephen Boyd <bebar...@gmail.com> <sb...@codeaurora.org>
> +Steven Grimm <kor...@midwinter.com> <sgrimm@sgrimm-mbp.local>
> +Sven Verdoolaege <sk...@kotnet.org> <sk...@liacs.nl>
> +Sven Verdoolaege <sk...@kotnet.org> <sven.verdoola...@cs.kuleuven.ac.be>
> Tay Ray Chuan <rcta...@gmail.com>
> Theodore Ts'o <ty...@mit.edu>
> +Thomas Ackermann <th.ac...@arcor.de> <th.acke...@arcor.de>
> Thomas Rast <tr...@inf.ethz.ch> <tr...@student.ethz.ch>
> +Timo Hirvonen <tihir...@gmail.com> <tihir...@ee.oulu.fi>
> +Toby Allsopp <toby.alls...@navman.co.nz> <toby.alls...@navman.co.nz>
> Tony Luck <tony.l...@intel.com>
> -Uwe Kleine-König <uwe_zeisber...@digi.com>
> -Uwe Kleine-König <uwe.kleine-koe...@digi.com>
> Uwe Kleine-König <uklei...@informatik.uni-freiburg.de>
> +Uwe Kleine-König <uwe.kleine-koe...@digi.com>
> +Uwe Kleine-König <uwe_zeisber...@digi.com>
> Uwe Kleine-König <uzeisber...@io.fsforth.de>
> Uwe Kleine-König <zeisb...@informatik.uni-freiburg.de>
> Ville Skyttä <s...@xemacs.org>
> Vitaly "_Vi" Shukela <public...@tut.by>
> William Pursell <bill.purs...@gmail.com>
> YOSHIFUJI Hideaki <yoshf...@linux-ipv6.org>
> -anonymous <li...@horizon.com>
> -anonymous <li...@horizon.net>
> +
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
