* [PATCH] Update .mailmap @ 2020-08-04 21:07 Martin Ågren 2020-08-04 21:28 ` Jeff King 0 siblings, 1 reply; 12+ messages in thread From: Martin Ågren @ 2020-08-04 21:07 UTC (permalink / raw) To: git 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. Use the by far most common e-mail address: * Brandon Williams * Jiang Xin Use the most recent e-mail address: * Andreas Schwab * Birger Skogeng Pedersen * Ed Maste * Fangyi Zhou * Kevin Willford * Peter Kaestle Use the one from their "Signed-off-by": * Damien Robert * Sun Chao Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- .mailmap | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index bde7aba756..b4e6eb7dd7 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,7 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru> Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com> Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com> Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu> +Andreas Schwab <schwab@linux-m68k.org> <schwab@suse.de> Andrey Mazo <ahippo@yandex.com> Mazo, Andrey <amazo@checkvideo.com> Aneesh Kumar K.V <aneesh.kumar@gmail.com> Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu> @@ -27,8 +28,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 +48,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 +68,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 +113,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 +150,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> @@ -213,6 +222,7 @@ 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> +Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com> Phil Hord <hordp@cisco.com> <phil.hord@gmail.com> Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com> Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk> @@ -256,6 +266,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> -- 2.28.0.236.gb10cc79966 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] Update .mailmap 2020-08-04 21:07 [PATCH] Update .mailmap Martin Ågren @ 2020-08-04 21:28 ` Jeff King 2020-08-04 22:01 ` Junio C Hamano 0 siblings, 1 reply; 12+ messages in thread From: Jeff King @ 2020-08-04 21:28 UTC (permalink / raw) To: Martin Ågren; +Cc: git On Tue, Aug 04, 2020 at 11:07:58PM +0200, Martin Ågren wrote: > 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. I don't have any specific objections, but you might want to cc all of the impacted people, which would make them more likely to notice if this isn't the right thing to do. -Peff ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Update .mailmap 2020-08-04 21:28 ` Jeff King @ 2020-08-04 22:01 ` Junio C Hamano 2020-08-05 6:53 ` Martin Ågren 2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren 0 siblings, 2 replies; 12+ messages in thread From: Junio C Hamano @ 2020-08-04 22:01 UTC (permalink / raw) To: Jeff King; +Cc: Martin Ågren, git Jeff King <peff@peff.net> writes: > On Tue, Aug 04, 2020 at 11:07:58PM +0200, Martin Ågren wrote: > >> 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. > > I don't have any specific objections, but you might want to cc all of > the impacted people, which would make them more likely to notice if this > isn't the right thing to do. Excellent suggestion. A commit with 10 acked-by would be ideal, but at least let's make sure we made enough effort to make them aware of, and asked them to help make these entries correct. Thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Update .mailmap 2020-08-04 22:01 ` Junio C Hamano @ 2020-08-05 6:53 ` Martin Ågren 2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren 1 sibling, 0 replies; 12+ messages in thread From: Martin Ågren @ 2020-08-05 6:53 UTC (permalink / raw) To: Junio C Hamano; +Cc: Jeff King, Git Mailing List On Wed, 5 Aug 2020 at 00:01, Junio C Hamano <gitster@pobox.com> wrote: > > Jeff King <peff@peff.net> writes: > > > On Tue, Aug 04, 2020 at 11:07:58PM +0200, Martin Ågren wrote: > > > >> 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. > > > > I don't have any specific objections, but you might want to cc all of > > the impacted people, which would make them more likely to notice if this > > isn't the right thing to do. > > Excellent suggestion. > > A commit with 10 acked-by would be ideal, but at least let's make > sure we made enough effort to make them aware of, and asked them to > help make these entries correct. Thanks, both. I even kept adding to a list of the addresses in Cc form, but in the last second I bailed on adding a long-ish Cc list. Resend on its way. Martin ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH RESEND] Update .mailmap 2020-08-04 22:01 ` Junio C Hamano 2020-08-05 6:53 ` Martin Ågren @ 2020-08-05 6:54 ` Martin Ågren 2020-08-05 7:00 ` Andreas Schwab ` (3 more replies) 1 sibling, 4 replies; 12+ messages in thread From: Martin Ågren @ 2020-08-05 6:54 UTC (permalink / raw) To: git Cc: Andreas Schwab, Andreas Schwab, Birger Skogeng Pedersen, Birger Skogeng Pedersen, Brandon Williams, Brandon Williams, Damien Robert, Damien Robert, Ed Maste, Ed Maste, Fangyi Zhou, Fangyi Zhou, Jiang Xin, Jiang Xin, Jiang Xin, Kevin Willford, Kevin Willford, Peter Kaestle, Peter Kaestle, Sun Chao, Sun Chao, Junio C Hamano, Jeff King 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. Use the by far most common e-mail address: * Brandon Williams * Jiang Xin Use the most recent e-mail address: * Andreas Schwab * Birger Skogeng Pedersen * Ed Maste * Fangyi Zhou * Kevin Willford * Peter Kaestle Use the one from their "Signed-off-by": * Damien Robert * Sun Chao Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- Ack? I'll collect Acks/Naks into the beginning of next week. .mailmap | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index bde7aba756..b4e6eb7dd7 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,7 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru> Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com> Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com> Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu> +Andreas Schwab <schwab@linux-m68k.org> <schwab@suse.de> Andrey Mazo <ahippo@yandex.com> Mazo, Andrey <amazo@checkvideo.com> Aneesh Kumar K.V <aneesh.kumar@gmail.com> Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu> @@ -27,8 +28,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 +48,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 +68,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 +113,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 +150,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> @@ -213,6 +222,7 @@ 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> +Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com> Phil Hord <hordp@cisco.com> <phil.hord@gmail.com> Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com> Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk> @@ -256,6 +266,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> -- 2.28.0.236.gb10cc79966 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH RESEND] Update .mailmap 2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren @ 2020-08-05 7:00 ` Andreas Schwab 2020-08-05 7:09 ` Martin Ågren 2020-08-08 9:11 ` Damien Robert ` (2 subsequent siblings) 3 siblings, 1 reply; 12+ messages in thread From: Andreas Schwab @ 2020-08-05 7:00 UTC (permalink / raw) To: Martin Ågren Cc: git, Birger Skogeng Pedersen, Birger Skogeng Pedersen, Brandon Williams, Brandon Williams, Damien Robert, Damien Robert, Ed Maste, Fangyi Zhou, Fangyi Zhou, Jiang Xin, Jiang Xin, Jiang Xin, Kevin Willford, Kevin Willford, Peter Kaestle, Peter Kaestle, Sun Chao, Sun Chao, Junio C Hamano, Jeff King On Aug 05 2020, Martin Ågren wrote: > diff --git a/.mailmap b/.mailmap > index bde7aba756..b4e6eb7dd7 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -18,6 +18,7 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru> > Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com> > Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com> > Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu> > +Andreas Schwab <schwab@linux-m68k.org> <schwab@suse.de> Neither of them are more recent. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH RESEND] Update .mailmap 2020-08-05 7:00 ` Andreas Schwab @ 2020-08-05 7:09 ` Martin Ågren 2020-08-05 16:12 ` Junio C Hamano 0 siblings, 1 reply; 12+ messages in thread From: Martin Ågren @ 2020-08-05 7:09 UTC (permalink / raw) To: Andreas Schwab Cc: Git Mailing List, Birger Skogeng Pedersen, Birger Skogeng Pedersen, Brandon Williams, Brandon Williams, Damien Robert, Damien Robert, Ed Maste, Fangyi Zhou, Fangyi Zhou, Jiang Xin, Jiang Xin, Kevin Willford, Kevin Willford, Peter Kaestle, Peter Kaestle, Sun Chao, Sun Chao, Junio C Hamano, Jeff King (Dropping Jiang Xin's huawei address. It bounces.) On Wed, 5 Aug 2020 at 09:00, Andreas Schwab <schwab@linux-m68k.org> wrote: > > On Aug 05 2020, Martin Ågren wrote: > > > --- a/.mailmap > > +++ b/.mailmap > > +Andreas Schwab <schwab@linux-m68k.org> <schwab@suse.de> > > Neither of them are more recent. Thanks, I'll take that as a Nak and drop your entry from the patch. Martin ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH RESEND] Update .mailmap 2020-08-05 7:09 ` Martin Ågren @ 2020-08-05 16:12 ` Junio C Hamano 0 siblings, 0 replies; 12+ messages in thread From: Junio C Hamano @ 2020-08-05 16:12 UTC (permalink / raw) To: Martin Ågren Cc: Andreas Schwab, Git Mailing List, Birger Skogeng Pedersen, Birger Skogeng Pedersen, Brandon Williams, Brandon Williams, Damien Robert, Damien Robert, Ed Maste, Fangyi Zhou, Fangyi Zhou, Jiang Xin, Jiang Xin, Kevin Willford, Kevin Willford, Peter Kaestle, Peter Kaestle, Sun Chao, Sun Chao, Jeff King Martin Ågren <martin.agren@gmail.com> writes: > (Dropping Jiang Xin's huawei address. It bounces.) > > On Wed, 5 Aug 2020 at 09:00, Andreas Schwab <schwab@linux-m68k.org> wrote: >> >> On Aug 05 2020, Martin Ågren wrote: >> >> > --- a/.mailmap >> > +++ b/.mailmap >> > +Andreas Schwab <schwab@linux-m68k.org> <schwab@suse.de> >> >> Neither of them are more recent. > > Thanks, I'll take that as a Nak and drop your entry from the patch. > > Martin FWIW, I do not know the reason why Andreas said the above, but there are folks who contribute to the same project (not limited to this one) sometimes as an individual and sometimes as an employee of a corporation, and want to differenciate which commit is which by using different author names. So migrating old and defunct addresses to the current and working one may be appreciated by the contributors, but we shouldn't make it a goal to have only one canonical form per one physical person. That won't work. Thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH RESEND] Update .mailmap 2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren 2020-08-05 7:00 ` Andreas Schwab @ 2020-08-08 9:11 ` Damien Robert 2020-08-09 22:38 ` Ed Maste 2020-08-16 15:30 ` [PATCH v2] " Martin Ågren 3 siblings, 0 replies; 12+ messages in thread From: Damien Robert @ 2020-08-08 9:11 UTC (permalink / raw) To: Martin Ågren Cc: git, Andreas Schwab, Andreas Schwab, Birger Skogeng Pedersen, Birger Skogeng Pedersen, Brandon Williams, Brandon Williams, Ed Maste, Fangyi Zhou, Fangyi Zhou, Jiang Xin, Jiang Xin, Jiang Xin, Kevin Willford, Kevin Willford, Peter Kaestle, Peter Kaestle, Sun Chao, Sun Chao, Junio C Hamano, Jeff King From Martin Ågren, Wed 05 Aug 2020 at 08:54:08 (+0200) : > Use the one from their "Signed-off-by": > * Damien Robert > +Damien Robert <damien.olivier.robert+git@gmail.com> <damien.olivier.robert@gmail.com> Ack. Thanks! ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH RESEND] Update .mailmap 2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren 2020-08-05 7:00 ` Andreas Schwab 2020-08-08 9:11 ` Damien Robert @ 2020-08-09 22:38 ` Ed Maste 2020-08-16 15:30 ` [PATCH v2] " Martin Ågren 3 siblings, 0 replies; 12+ messages in thread From: Ed Maste @ 2020-08-09 22:38 UTC (permalink / raw) To: Martin Ågren; +Cc: git mailing list On Wed, 5 Aug 2020 at 02:55, Martin Ågren <martin.agren@gmail.com> wrote: > > 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. > ... > * Ed Maste ... > > Signed-off-by: Martin Ågren <martin.agren@gmail.com> Acked-by: Ed Maste <emaste@FreeBSD.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2] Update .mailmap 2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren ` (2 preceding siblings ...) 2020-08-09 22:38 ` Ed Maste @ 2020-08-16 15:30 ` Martin Ågren 2020-08-16 17:17 ` Junio C Hamano 3 siblings, 1 reply; 12+ messages in thread From: Martin Ågren @ 2020-08-16 15:30 UTC (permalink / raw) To: git Cc: Andreas Schwab, Andreas Schwab, Birger Skogeng Pedersen, Birger Skogeng Pedersen, Brandon Williams, Brandon Williams, Damien Robert, Damien Robert, Ed Maste, Ed Maste, Fangyi Zhou, Fangyi Zhou, Jiang Xin, Jiang Xin, Kevin Willford, Kevin Willford, Peter Kaestle, Peter Kaestle, Sun Chao, Sun Chao, Junio C Hamano, Jeff King 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(-) 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> -- 2.28.0.277.g9b3c35fffd ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v2] Update .mailmap 2020-08-16 15:30 ` [PATCH v2] " Martin Ågren @ 2020-08-16 17:17 ` Junio C Hamano 0 siblings, 0 replies; 12+ messages in thread From: Junio C Hamano @ 2020-08-16 17:17 UTC (permalink / raw) To: Martin Ågren Cc: git, Andreas Schwab, Andreas Schwab, Birger Skogeng Pedersen, Birger Skogeng Pedersen, Brandon Williams, Brandon Williams, Damien Robert, Damien Robert, Ed Maste, Fangyi Zhou, Fangyi Zhou, Jiang Xin, Jiang Xin, Kevin Willford, Kevin Willford, Peter Kaestle, Peter Kaestle, Sun Chao, Sun Chao, Jeff King 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. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-08-16 17:28 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-08-04 21:07 [PATCH] Update .mailmap Martin Ågren 2020-08-04 21:28 ` Jeff King 2020-08-04 22:01 ` Junio C Hamano 2020-08-05 6:53 ` Martin Ågren 2020-08-05 6:54 ` [PATCH RESEND] " Martin Ågren 2020-08-05 7:00 ` Andreas Schwab 2020-08-05 7:09 ` Martin Ågren 2020-08-05 16:12 ` Junio C Hamano 2020-08-08 9:11 ` Damien Robert 2020-08-09 22:38 ` Ed Maste 2020-08-16 15:30 ` [PATCH v2] " Martin Ågren 2020-08-16 17:17 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).