diff mbox series

[v2] Update .mailmap

Message ID 20200816153037.1143576-1-martin.agren@gmail.com (mailing list archive)
State New, archived
Headers show
Series [v2] Update .mailmap | expand

Commit Message

Martin Ågren Aug. 16, 2020, 3:30 p.m. UTC 
Similar to a35b13fce0 ("Update .mailmap", 2018-11-09), make the output
of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing
the current and preferred addresses for authors that appear with more
than one address.

By request, don't add an entry for Andreas Schwab. For Brandon Williams,
use the e-mail address they gave in a62527b0e5 ("mailmap: update brandon
williams's email address", 2018-12-07). Peter Kaestle has used different
addresses to separate work-time and spare-time contributions, but
similar to 3fa0e04667 ("mailmap: add an additional email address for
brian m. carlson", 2020-02-20), has asked that we attribute those
commits to the same person.

Use the by far most common e-mail address:
 * Jiang Xin

Use the most recent e-mail address:
 * Birger Skogeng Pedersen
 * Ed Maste
 * Fangyi Zhou
 * Kevin Willford
 * Peter Kaestle

Use the one they used for their "Signed-off-by":
 * Damien Robert
 * Sun Chao

Acked-by: Ed Maste <emaste@FreeBSD.org>
Acked-by: Damien Robert <damien.olivier.robert+git@gmail.com>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 .mailmap | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Junio C Hamano Aug. 16, 2020, 5:17 p.m. UTC | #1 
Martin Ågren <martin.agren@gmail.com> writes:

> Acked-by: Ed Maste <emaste@FreeBSD.org>
> Acked-by: Damien Robert <damien.olivier.robert+git@gmail.com>

It may be a good idea to also add two addresses for Andreas Schwab
who already answered that these should not be unified with a comment
for documentation purposes, perhaps something along the lines of...

    # These two addresses are used on purpose---do not merge.
    Human Readable Name <address1>
    Human Readable Name <address2>

to help future contributors who want to follow up on your effort.

Perhaps we also may want to have the proposed but not yet acked
entries in comment for documentation purposes, like so:

    # Asked, but not acked yet
    # Human Readable Name0 <address0.1> <address0.2>
    # Human Readable Name1 <address1.1> <address1.2>
    # ...

Thanks.
diff mbox series

Patch

diff --git a/.mailmap b/.mailmap
index bde7aba756..f3b335af20 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,8 +27,10 @@  Ben Peart <benpeart@microsoft.com> <peartben@gmail.com>
 Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
 Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
 Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
+Birger Skogeng Pedersen <birger.sp@gmail.com> <birgersp@gmail.com>
 Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
 Brandon Williams <bwilliams.eng@gmail.com> <bmwill@google.com>
+Brandon Williams <bwilliams.eng@gmail.com> <bwilliamseng@gmail.com>
 brian m. carlson <sandals@crustytoothpaste.net>
 brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
 brian m. carlson <sandals@crustytoothpaste.net> <bk2204@github.com>
@@ -45,6 +47,7 @@  Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros
 Clemens Buchacher <drizzd@gmx.net> <drizzd@aon.at>
 Clemens Buchacher <drizzd@gmx.net> <clemens.buchacher@intel.com>
 Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
+Damien Robert <damien.olivier.robert+git@gmail.com> <damien.olivier.robert@gmail.com>
 Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
 Dana L. How <danahow@gmail.com> Dana How
@@ -64,13 +67,15 @@  Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitga
 Deskin Miller <deskinm@umich.edu>
 Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
 Dirk Süsserott <newsletter@dirk.my1.cc>
+Ed Maste <emaste@FreeBSD.org> <emaste@freebsd.org>
 Eric Blake <eblake@redhat.com> <ebb9@byu.net>
 Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
 Eric S. Raymond <esr@thyrsus.com>
 Eric Wong <e@80x24.org> <normalperson@yhbt.net>
 Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
 Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
-Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi
+Fangyi Zhou <me@fangyi.io> <fangyi.zhou@yuriko.moe>
+Fangyi Zhou <me@fangyi.io> Zhou Fangyi <fangyi.zhou@yuriko.moe>
 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>
@@ -107,6 +112,8 @@  Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
 Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
 Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
 Jens Lindström <jl@opera.com> Jens Lindstrom <jl@opera.com>
+Jiang Xin <worldhello.net@gmail.com> <xin.jiang@huawei.com>
+Jiang Xin <worldhello.net@gmail.com> <zhiyou.jx@alibaba-inc.com>
 Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com>
@@ -142,6 +149,7 @@  Kazuki Saitoh <ksaitoh560@gmail.com> kazuki saitoh <ksaitoh560@gmail.com>
 Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
 Kent Engstrom <kent@lysator.liu.se>
 Kevin Leung <kevinlsk@gmail.com>
+Kevin Willford <Kevin.Willford@microsoft.com> <kewillf@microsoft.com>
 Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
 Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
 Knut Franke <Knut.Franke@gmx.de> <k.franke@science-computing.de>
@@ -209,6 +217,7 @@  Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
 Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
 Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
 Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de>
+Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com>
 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>
@@ -256,6 +265,7 @@  Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
 Steven Grimm <koreth@midwinter.com> koreth@midwinter.com
 Steven Walter <stevenrwalter@gmail.com> <swalter@lexmark.com>
 Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
+Sun Chao <sunchao9@huawei.com> <16657101987@163.com>
 Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
 Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
 SZEDER Gábor <szeder.dev@gmail.com> <szeder@ira.uka.de>