# [PATCH] Update .mailmap 12 messages from 2020-08-04 to 2020-08-16. Participants: Martin Ågren, Jeff King, Junio C Hamano, Andreas Schwab, Damien Robert, Ed Maste. Thread: https://gitlist.dev/t/53982 ## Martin Ågren, 2020-08-04 21:07 Subject: [PATCH] Update .mailmap Message-ID: <20200804210758.1241259-1-martin.agren@gmail.com> URL: https://gitlist.dev/e/20200804210758.1241259-1-martin.agren%40gmail.com ``` 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 --- .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 Alexey Shumkin Anders Kaseorg Anders Kaseorg +Andreas Schwab Andrey Mazo Mazo, Andrey Aneesh Kumar K.V Amos Waterland @@ -27,8 +28,10 @@ Ben Peart Ben Walton Benoit Sigoure Bernt Hansen +Birger Skogeng Pedersen Brandon Casey Brandon Williams +Brandon Williams brian m. carlson brian m. carlson brian m. carlson @@ -45,6 +48,7 @@ Christopher Díaz Riveros Christopher Diaz Riveros Clemens Buchacher Clemens Buchacher Csaba Henk +Damien Robert Dan Johnson Dana L. How Dana L. How Dana How @@ -64,13 +68,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget Đoàn Trần Công Danh Doan Tran Cong Danh Dirk Süsserott +Ed Maste Eric Blake Eric Hanchrow Eric S. Raymond Eric Wong Erik Faye-Lund Eyvind Bernhardsen

-Fangyi Zhou Zhou Fangyi +Fangyi Zhou +Fangyi Zhou Zhou Fangyi Florian Achleitner Franck Bui-Huu Frank Lichtenheld @@ -107,6 +113,8 @@ Jeff Muizelaar Jens Axboe Jens Axboe Jens Lindström Jens Lindstrom +Jiang Xin +Jiang Xin

Jim Meyering Joachim Berdal Haga Joachim Jablon @@ -142,6 +150,7 @@ Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung +Kevin Willford Kirill Smelkov Kirill Smelkov Knut Franke

@@ -213,6 +222,7 @@ Peter Krefting Peter Krefting Petr Baudis Petr Baudis +Peter Kaestle Phil Hord Philip Jägenstedt Philip Oakley # secondary @@ -256,6 +266,7 @@ Steven Grimm

Steven Grimm koreth@midwinter.com Steven Walter Steven Walter +Sun Chao <16657101987@163.com> Sven Verdoolaege Sven Verdoolaege SZEDER Gábor -- 2.28.0.236.gb10cc79966 ``` ## Jeff King, 2020-08-04 21:28 Subject: Re: [PATCH] Update .mailmap Message-ID: <20200804212831.GD2020725@coredump.intra.peff.net> URL: https://gitlist.dev/e/20200804212831.GD2020725%40coredump.intra.peff.net In-Reply-To: <20200804210758.1241259-1-martin.agren@gmail.com> ``` 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 ``` ## Junio C Hamano, 2020-08-04 22:01 Subject: Re: [PATCH] Update .mailmap Message-ID: URL: https://gitlist.dev/e/xmqqy2muqddg.fsf%40gitster.c.googlers.com In-Reply-To: <20200804212831.GD2020725@coredump.intra.peff.net> ``` Jeff King 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. ``` ## Martin Ågren, 2020-08-05 06:53 Subject: Re: [PATCH] Update .mailmap Message-ID: URL: https://gitlist.dev/e/CAN0heSp%2Byf5jg0eNxGQXYUf2Y48nOuK-H3TX-y-Yc-TuzhOzuA%40mail.gmail.com In-Reply-To: ``` On Wed, 5 Aug 2020 at 00:01, Junio C Hamano wrote: > > Jeff King 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 ``` ## Martin Ågren, 2020-08-05 06:54 Subject: [PATCH RESEND] Update .mailmap Message-ID: <20200805065408.1242617-1-martin.agren@gmail.com> URL: https://gitlist.dev/e/20200805065408.1242617-1-martin.agren%40gmail.com In-Reply-To: ``` 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 --- 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 Alexey Shumkin Anders Kaseorg Anders Kaseorg +Andreas Schwab Andrey Mazo Mazo, Andrey Aneesh Kumar K.V Amos Waterland @@ -27,8 +28,10 @@ Ben Peart Ben Walton Benoit Sigoure Bernt Hansen +Birger Skogeng Pedersen Brandon Casey Brandon Williams +Brandon Williams brian m. carlson brian m. carlson brian m. carlson @@ -45,6 +48,7 @@ Christopher Díaz Riveros Christopher Diaz Riveros Clemens Buchacher Clemens Buchacher Csaba Henk +Damien Robert Dan Johnson Dana L. How Dana L. How Dana How @@ -64,13 +68,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget Đoàn Trần Công Danh Doan Tran Cong Danh Dirk Süsserott +Ed Maste Eric Blake Eric Hanchrow Eric S. Raymond Eric Wong Erik Faye-Lund Eyvind Bernhardsen

Jim Meyering Joachim Berdal Haga Joachim Jablon @@ -142,6 +150,7 @@ Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung +Kevin Willford Kirill Smelkov Kirill Smelkov Knut Franke

@@ -213,6 +222,7 @@ Peter Krefting Peter Krefting Petr Baudis Petr Baudis +Peter Kaestle Phil Hord Philip Jägenstedt Philip Oakley # secondary @@ -256,6 +266,7 @@ Steven Grimm

Steven Grimm koreth@midwinter.com Steven Walter Steven Walter +Sun Chao <16657101987@163.com> Sven Verdoolaege Sven Verdoolaege SZEDER Gábor -- 2.28.0.236.gb10cc79966 ``` ## Andreas Schwab, 2020-08-05 07:00 Subject: Re: [PATCH RESEND] Update .mailmap Message-ID: <87eeolo9v9.fsf@linux-m68k.org> URL: https://gitlist.dev/e/87eeolo9v9.fsf%40linux-m68k.org In-Reply-To: <20200805065408.1242617-1-martin.agren@gmail.com> ``` 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 > Alexey Shumkin > Anders Kaseorg > Anders Kaseorg > +Andreas Schwab 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." ``` ## Martin Ågren, 2020-08-05 07:09 Subject: Re: [PATCH RESEND] Update .mailmap Message-ID: URL: https://gitlist.dev/e/CAN0heSoa%3DY1HMaZD%3DeQYD8uphrm%2BVRZe9yD%2B8voNuWPetHm83w%40mail.gmail.com In-Reply-To: <87eeolo9v9.fsf@linux-m68k.org> ``` (Dropping Jiang Xin's huawei address. It bounces.) On Wed, 5 Aug 2020 at 09:00, Andreas Schwab wrote: > > On Aug 05 2020, Martin Ågren wrote: > > > --- a/.mailmap > > +++ b/.mailmap > > +Andreas Schwab > > Neither of them are more recent. Thanks, I'll take that as a Nak and drop your entry from the patch. Martin ``` ## Junio C Hamano, 2020-08-05 16:12 Subject: Re: [PATCH RESEND] Update .mailmap Message-ID: URL: https://gitlist.dev/e/xmqq5z9xoyve.fsf%40gitster.c.googlers.com In-Reply-To: ``` Martin Ågren writes: > (Dropping Jiang Xin's huawei address. It bounces.) > > On Wed, 5 Aug 2020 at 09:00, Andreas Schwab wrote: >> >> On Aug 05 2020, Martin Ågren wrote: >> >> > --- a/.mailmap >> > +++ b/.mailmap >> > +Andreas Schwab >> >> 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. ``` ## Damien Robert, 2020-08-08 09:11 Subject: Re: [PATCH RESEND] Update .mailmap Message-ID: <20200808091103.rh5iur5sopgnlfcw@doriath> URL: https://gitlist.dev/e/20200808091103.rh5iur5sopgnlfcw%40doriath In-Reply-To: <20200805065408.1242617-1-martin.agren@gmail.com> ``` From Martin Ågren, Wed 05 Aug 2020 at 08:54:08 (+0200) : > Use the one from their "Signed-off-by": > * Damien Robert > +Damien Robert Ack. Thanks! ``` ## Ed Maste, 2020-08-09 22:38 Subject: Re: [PATCH RESEND] Update .mailmap Message-ID: URL: https://gitlist.dev/e/CAPyFy2BzVD3omAHJx%2BetucVkGt3KnmURrJVXvhmmW9_JkPXTuQ%40mail.gmail.com In-Reply-To: <20200805065408.1242617-1-martin.agren@gmail.com> ``` On Wed, 5 Aug 2020 at 02:55, 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. > ... > * Ed Maste ... > > Signed-off-by: Martin Ågren Acked-by: Ed Maste ``` ## Martin Ågren, 2020-08-16 15:30 Subject: [PATCH v2] Update .mailmap Message-ID: <20200816153037.1143576-1-martin.agren@gmail.com> URL: https://gitlist.dev/e/20200816153037.1143576-1-martin.agren%40gmail.com In-Reply-To: <20200805065408.1242617-1-martin.agren@gmail.com> ``` 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 Acked-by: Damien Robert Signed-off-by: Martin Ågren --- .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 Ben Walton Benoit Sigoure Bernt Hansen +Birger Skogeng Pedersen Brandon Casey Brandon Williams +Brandon Williams brian m. carlson brian m. carlson brian m. carlson @@ -45,6 +47,7 @@ Christopher Díaz Riveros Christopher Diaz Riveros Clemens Buchacher Clemens Buchacher Csaba Henk +Damien Robert Dan Johnson Dana L. How Dana L. How Dana How @@ -64,13 +67,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget Đoàn Trần Công Danh Doan Tran Cong Danh Dirk Süsserott +Ed Maste Eric Blake Eric Hanchrow Eric S. Raymond Eric Wong Erik Faye-Lund Eyvind Bernhardsen

-Fangyi Zhou Zhou Fangyi +Fangyi Zhou +Fangyi Zhou Zhou Fangyi Florian Achleitner Franck Bui-Huu Frank Lichtenheld @@ -107,6 +112,8 @@ Jeff Muizelaar Jens Axboe Jens Axboe Jens Lindström Jens Lindstrom +Jiang Xin +Jiang Xin

Jim Meyering Joachim Berdal Haga Joachim Jablon @@ -142,6 +149,7 @@ Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung