{"thread":{"id":"53982","subject":"[PATCH] Update .mailmap","startedAt":"2020-08-04T21:08:15Z","lastAt":"2020-08-16T17:27:43Z","messageCount":12,"participants":["Martin Ågren","Jeff King","Junio C Hamano","Andreas Schwab","Damien Robert","Ed Maste"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"402841","messageId":"20200804210758.1241259-1-martin.agren@gmail.com","threadId":"53982","inReplyTo":null,"subject":"[PATCH] Update .mailmap","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-08-04T21:07:58Z","receivedAt":"2020-08-04T21:08:15Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Similar to a35b13fce0 (\"Update .mailmap\", 2018-11-09), make the output\nof `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing\nthe current and preferred addresses for authors that appear with more\nthan one address.\n\nUse the by far most common e-mail address:\n * Brandon Williams\n * Jiang Xin\n\nUse the most recent e-mail address:\n * Andreas Schwab\n * Birger Skogeng Pedersen\n * Ed Maste\n * Fangyi Zhou\n * Kevin Willford\n * Peter Kaestle\n\nUse the one from their \"Signed-off-by\":\n * Damien Robert\n * Sun Chao\n\nSigned-off-by: Martin Ågren \n---\n .mailmap | 13 ++++++++++++-\n 1 file changed, 12 insertions(+), 1 deletion(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex bde7aba756..b4e6eb7dd7 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -18,6 +18,7 @@ Alexey Shumkin \n Alexey Shumkin \n Anders Kaseorg \n Anders Kaseorg \n+Andreas Schwab \n Andrey Mazo Mazo, Andrey \n Aneesh Kumar K.V \n Amos Waterland \n@@ -27,8 +28,10 @@ Ben Peart \n Ben Walton \n Benoit Sigoure \n Bernt Hansen \n+Birger Skogeng Pedersen \n Brandon Casey \n Brandon Williams \n+Brandon Williams \n brian m. carlson \n brian m. carlson \n brian m. carlson \n@@ -45,6 +48,7 @@ Christopher Díaz Riveros Christopher Diaz Riveros\n Clemens Buchacher \n Clemens Buchacher \n Csaba Henk \n+Damien Robert \n Dan Johnson \n Dana L. How \n Dana L. How Dana How\n@@ -64,13 +68,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget \n Đoàn Trần Công Danh Doan Tran Cong Danh\n Dirk Süsserott \n+Ed Maste \n Eric Blake \n Eric Hanchrow \n Eric S. Raymond \n Eric Wong \n Erik Faye-Lund \n Eyvind Bernhardsen \n-Fangyi Zhou Zhou Fangyi\n+Fangyi Zhou \n+Fangyi Zhou Zhou Fangyi \n Florian Achleitner \n Franck Bui-Huu \n Frank Lichtenheld \n@@ -107,6 +113,8 @@ Jeff Muizelaar \n Jens Axboe \n Jens Axboe \n Jens Lindström Jens Lindstrom \n+Jiang Xin \n+Jiang Xin \n Jim Meyering \n Joachim Berdal Haga \n Joachim Jablon \n@@ -142,6 +150,7 @@ Kazuki Saitoh kazuki saitoh \n Keith Cascio \n Kent Engstrom \n Kevin Leung \n+Kevin Willford \n Kirill Smelkov \n Kirill Smelkov \n Knut Franke \n@@ -213,6 +222,7 @@ Peter Krefting \n Peter Krefting \n Petr Baudis \n Petr Baudis \n+Peter Kaestle \n Phil Hord \n Philip Jägenstedt \n Philip Oakley # secondary \n@@ -256,6 +266,7 @@ Steven Grimm \n Steven Grimm koreth@midwinter.com\n Steven Walter \n Steven Walter \n+Sun Chao <16657101987@163.com>\n Sven Verdoolaege \n Sven Verdoolaege \n SZEDER Gábor \n-- \n2.28.0.236.gb10cc79966\n\n"},{"id":"402848","messageId":"20200804212831.GD2020725@coredump.intra.peff.net","threadId":"53982","inReplyTo":"20200804210758.1241259-1-martin.agren@gmail.com","subject":"Re: [PATCH] Update .mailmap","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-08-04T21:28:31Z","receivedAt":"2020-08-04T21:28:33Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Aug 04, 2020 at 11:07:58PM +0200, Martin Ågren wrote:\n\n> Similar to a35b13fce0 (\"Update .mailmap\", 2018-11-09), make the output\n> of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing\n> the current and preferred addresses for authors that appear with more\n> than one address.\n\nI don't have any specific objections, but you might want to cc all of\nthe impacted people, which would make them more likely to notice if this\nisn't the right thing to do.\n\n-Peff\n"},{"id":"402860","messageId":"xmqqy2muqddg.fsf@gitster.c.googlers.com","threadId":"53982","inReplyTo":"20200804212831.GD2020725@coredump.intra.peff.net","subject":"Re: [PATCH] Update .mailmap","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-04T22:01:47Z","receivedAt":"2020-08-04T22:01:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Tue, Aug 04, 2020 at 11:07:58PM +0200, Martin Ågren wrote:\n>\n>> Similar to a35b13fce0 (\"Update .mailmap\", 2018-11-09), make the output\n>> of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing\n>> the current and preferred addresses for authors that appear with more\n>> than one address.\n>\n> I don't have any specific objections, but you might want to cc all of\n> the impacted people, which would make them more likely to notice if this\n> isn't the right thing to do.\n\nExcellent suggestion. \n\nA commit with 10 acked-by would be ideal, but at least let's make\nsure we made enough effort to make them aware of, and asked them to\nhelp make these entries correct.\n\nThanks.\n\n"},{"id":"402897","messageId":"CAN0heSp+yf5jg0eNxGQXYUf2Y48nOuK-H3TX-y-Yc-TuzhOzuA@mail.gmail.com","threadId":"53982","inReplyTo":"xmqqy2muqddg.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] Update .mailmap","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-08-05T06:53:41Z","receivedAt":"2020-08-05T06:53:57Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"On Wed, 5 Aug 2020 at 00:01, Junio C Hamano wrote:\n>\n> Jeff King writes:\n>\n> > On Tue, Aug 04, 2020 at 11:07:58PM +0200, Martin Ågren wrote:\n> >\n> >> Similar to a35b13fce0 (\"Update .mailmap\", 2018-11-09), make the output\n> >> of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing\n> >> the current and preferred addresses for authors that appear with more\n> >> than one address.\n> >\n> > I don't have any specific objections, but you might want to cc all of\n> > the impacted people, which would make them more likely to notice if this\n> > isn't the right thing to do.\n>\n> Excellent suggestion.\n>\n> A commit with 10 acked-by would be ideal, but at least let's make\n> sure we made enough effort to make them aware of, and asked them to\n> help make these entries correct.\n\nThanks, both. I even kept adding to a list of the addresses in Cc form,\nbut in the last second I bailed on adding a long-ish Cc list. Resend on\nits way.\n\nMartin\n"},{"id":"402898","messageId":"20200805065408.1242617-1-martin.agren@gmail.com","threadId":"53982","inReplyTo":"xmqqy2muqddg.fsf@gitster.c.googlers.com","subject":"[PATCH RESEND] Update .mailmap","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-08-05T06:54:08Z","receivedAt":"2020-08-05T06:55:14Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Similar to a35b13fce0 (\"Update .mailmap\", 2018-11-09), make the output\nof `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing\nthe current and preferred addresses for authors that appear with more\nthan one address.\n\nUse the by far most common e-mail address:\n * Brandon Williams\n * Jiang Xin\n\nUse the most recent e-mail address:\n * Andreas Schwab\n * Birger Skogeng Pedersen\n * Ed Maste\n * Fangyi Zhou\n * Kevin Willford\n * Peter Kaestle\n\nUse the one from their \"Signed-off-by\":\n * Damien Robert\n * Sun Chao\n\nSigned-off-by: Martin Ågren \n---\n Ack? I'll collect Acks/Naks into the beginning of next week.\n\n .mailmap | 13 ++++++++++++-\n 1 file changed, 12 insertions(+), 1 deletion(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex bde7aba756..b4e6eb7dd7 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -18,6 +18,7 @@ Alexey Shumkin \n Alexey Shumkin \n Anders Kaseorg \n Anders Kaseorg \n+Andreas Schwab \n Andrey Mazo Mazo, Andrey \n Aneesh Kumar K.V \n Amos Waterland \n@@ -27,8 +28,10 @@ Ben Peart \n Ben Walton \n Benoit Sigoure \n Bernt Hansen \n+Birger Skogeng Pedersen \n Brandon Casey \n Brandon Williams \n+Brandon Williams \n brian m. carlson \n brian m. carlson \n brian m. carlson \n@@ -45,6 +48,7 @@ Christopher Díaz Riveros Christopher Diaz Riveros\n Clemens Buchacher \n Clemens Buchacher \n Csaba Henk \n+Damien Robert \n Dan Johnson \n Dana L. How \n Dana L. How Dana How\n@@ -64,13 +68,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget \n Đoàn Trần Công Danh Doan Tran Cong Danh\n Dirk Süsserott \n+Ed Maste \n Eric Blake \n Eric Hanchrow \n Eric S. Raymond \n Eric Wong \n Erik Faye-Lund \n Eyvind Bernhardsen \n-Fangyi Zhou Zhou Fangyi\n+Fangyi Zhou \n+Fangyi Zhou Zhou Fangyi \n Florian Achleitner \n Franck Bui-Huu \n Frank Lichtenheld \n@@ -107,6 +113,8 @@ Jeff Muizelaar \n Jens Axboe \n Jens Axboe \n Jens Lindström Jens Lindstrom \n+Jiang Xin \n+Jiang Xin \n Jim Meyering \n Joachim Berdal Haga \n Joachim Jablon \n@@ -142,6 +150,7 @@ Kazuki Saitoh kazuki saitoh \n Keith Cascio \n Kent Engstrom \n Kevin Leung \n+Kevin Willford \n Kirill Smelkov \n Kirill Smelkov \n Knut Franke \n@@ -213,6 +222,7 @@ Peter Krefting \n Peter Krefting \n Petr Baudis \n Petr Baudis \n+Peter Kaestle \n Phil Hord \n Philip Jägenstedt \n Philip Oakley # secondary \n@@ -256,6 +266,7 @@ Steven Grimm \n Steven Grimm koreth@midwinter.com\n Steven Walter \n Steven Walter \n+Sun Chao <16657101987@163.com>\n Sven Verdoolaege \n Sven Verdoolaege \n SZEDER Gábor \n-- \n2.28.0.236.gb10cc79966\n\n"},{"id":"402899","messageId":"87eeolo9v9.fsf@linux-m68k.org","threadId":"53982","inReplyTo":"20200805065408.1242617-1-martin.agren@gmail.com","subject":"Re: [PATCH RESEND] Update .mailmap","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2020-08-05T07:00:26Z","receivedAt":"2020-08-05T07:00:40Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"On Aug 05 2020, Martin Ågren wrote:\n\n> diff --git a/.mailmap b/.mailmap\n> index bde7aba756..b4e6eb7dd7 100644\n> --- a/.mailmap\n> +++ b/.mailmap\n> @@ -18,6 +18,7 @@ Alexey Shumkin \n> Alexey Shumkin \n> Anders Kaseorg \n> Anders Kaseorg \n> +Andreas Schwab \n\nNeither of them are more recent.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1\n\"And now for something completely different.\"\n"},{"id":"402900","messageId":"CAN0heSoa=Y1HMaZD=eQYD8uphrm+VRZe9yD+8voNuWPetHm83w@mail.gmail.com","threadId":"53982","inReplyTo":"87eeolo9v9.fsf@linux-m68k.org","subject":"Re: [PATCH RESEND] Update .mailmap","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-08-05T07:09:48Z","receivedAt":"2020-08-05T07:10:04Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"(Dropping Jiang Xin's huawei address. It bounces.)\n\nOn Wed, 5 Aug 2020 at 09:00, Andreas Schwab wrote:\n>\n> On Aug 05 2020, Martin Ågren wrote:\n>\n> > --- a/.mailmap\n> > +++ b/.mailmap\n> > +Andreas Schwab \n>\n> Neither of them are more recent.\n\nThanks, I'll take that as a Nak and drop your entry from the patch.\n\nMartin\n"},{"id":"402950","messageId":"xmqq5z9xoyve.fsf@gitster.c.googlers.com","threadId":"53982","inReplyTo":"CAN0heSoa=Y1HMaZD=eQYD8uphrm+VRZe9yD+8voNuWPetHm83w@mail.gmail.com","subject":"Re: [PATCH RESEND] Update .mailmap","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-05T16:12:37Z","receivedAt":"2020-08-05T20:04:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> (Dropping Jiang Xin's huawei address. It bounces.)\n>\n> On Wed, 5 Aug 2020 at 09:00, Andreas Schwab wrote:\n>>\n>> On Aug 05 2020, Martin Ågren wrote:\n>>\n>> > --- a/.mailmap\n>> > +++ b/.mailmap\n>> > +Andreas Schwab \n>>\n>> Neither of them are more recent.\n>\n> Thanks, I'll take that as a Nak and drop your entry from the patch.\n>\n> Martin\n\nFWIW, I do not know the reason why Andreas said the above, but there\nare folks who contribute to the same project (not limited to this\none) sometimes as an individual and sometimes as an employee of a\ncorporation, and want to differenciate which commit is which by\nusing different author names. So migrating old and defunct\naddresses to the current and working one may be appreciated by the\ncontributors, but we shouldn't make it a goal to have only one\ncanonical form per one physical person. That won't work.\n\nThanks.\n"},{"id":"403189","messageId":"20200808091103.rh5iur5sopgnlfcw@doriath","threadId":"53982","inReplyTo":"20200805065408.1242617-1-martin.agren@gmail.com","subject":"Re: [PATCH RESEND] Update .mailmap","fromName":"Damien Robert","fromEmail":"damien.olivier.robert@gmail.com","sentAt":"2020-08-08T09:11:03Z","receivedAt":"2020-08-08T09:11:19Z","isPatch":true,"sender":{"key":"damien.olivier.robert@gmail.com","avatar":null},"body":"From Martin Ågren, Wed 05 Aug 2020 at 08:54:08 (+0200) :\n> Use the one from their \"Signed-off-by\":\n> * Damien Robert\n> +Damien Robert \n\nAck.\n\nThanks!\n"},{"id":"403240","messageId":"CAPyFy2BzVD3omAHJx+etucVkGt3KnmURrJVXvhmmW9_JkPXTuQ@mail.gmail.com","threadId":"53982","inReplyTo":"20200805065408.1242617-1-martin.agren@gmail.com","subject":"Re: [PATCH RESEND] Update .mailmap","fromName":"Ed Maste","fromEmail":"emaste@freebsd.org","sentAt":"2020-08-09T22:38:50Z","receivedAt":"2020-08-09T22:40:00Z","isPatch":true,"sender":{"key":"emaste@freebsd.org","avatar":"https://avatars.githubusercontent.com/u/1034582?v=4"},"body":"On Wed, 5 Aug 2020 at 02:55, Martin Ågren wrote:\n>\n> Similar to a35b13fce0 (\"Update .mailmap\", 2018-11-09), make the output\n> of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing\n> the current and preferred addresses for authors that appear with more\n> than one address.\n>\n...\n> * Ed Maste\n...\n>\n> Signed-off-by: Martin Ågren \n\nAcked-by: Ed Maste \n"},{"id":"403796","messageId":"20200816153037.1143576-1-martin.agren@gmail.com","threadId":"53982","inReplyTo":"20200805065408.1242617-1-martin.agren@gmail.com","subject":"[PATCH v2] Update .mailmap","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-08-16T15:30:37Z","receivedAt":"2020-08-16T15:34:05Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Similar to a35b13fce0 (\"Update .mailmap\", 2018-11-09), make the output\nof `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing\nthe current and preferred addresses for authors that appear with more\nthan one address.\n\nBy request, don't add an entry for Andreas Schwab. For Brandon Williams,\nuse the e-mail address they gave in a62527b0e5 (\"mailmap: update brandon\nwilliams's email address\", 2018-12-07). Peter Kaestle has used different\naddresses to separate work-time and spare-time contributions, but\nsimilar to 3fa0e04667 (\"mailmap: add an additional email address for\nbrian m. carlson\", 2020-02-20), has asked that we attribute those\ncommits to the same person.\n\nUse the by far most common e-mail address:\n * Jiang Xin\n\nUse the most recent e-mail address:\n * Birger Skogeng Pedersen\n * Ed Maste\n * Fangyi Zhou\n * Kevin Willford\n * Peter Kaestle\n\nUse the one they used for their \"Signed-off-by\":\n * Damien Robert\n * Sun Chao\n\nAcked-by: Ed Maste \nAcked-by: Damien Robert \nSigned-off-by: Martin Ågren \n---\n .mailmap | 12 +++++++++++-\n 1 file changed, 11 insertions(+), 1 deletion(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex bde7aba756..f3b335af20 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -27,8 +27,10 @@ Ben Peart \n Ben Walton \n Benoit Sigoure \n Bernt Hansen \n+Birger Skogeng Pedersen \n Brandon Casey \n Brandon Williams \n+Brandon Williams \n brian m. carlson \n brian m. carlson \n brian m. carlson \n@@ -45,6 +47,7 @@ Christopher Díaz Riveros Christopher Diaz Riveros\n Clemens Buchacher \n Clemens Buchacher \n Csaba Henk \n+Damien Robert \n Dan Johnson \n Dana L. How \n Dana L. How Dana How\n@@ -64,13 +67,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget \n Đoàn Trần Công Danh Doan Tran Cong Danh\n Dirk Süsserott \n+Ed Maste \n Eric Blake \n Eric Hanchrow \n Eric S. Raymond \n Eric Wong \n Erik Faye-Lund \n Eyvind Bernhardsen \n-Fangyi Zhou Zhou Fangyi\n+Fangyi Zhou \n+Fangyi Zhou Zhou Fangyi \n Florian Achleitner \n Franck Bui-Huu \n Frank Lichtenheld \n@@ -107,6 +112,8 @@ Jeff Muizelaar \n Jens Axboe \n Jens Axboe \n Jens Lindström Jens Lindstrom \n+Jiang Xin \n+Jiang Xin \n Jim Meyering \n Joachim Berdal Haga \n Joachim Jablon \n@@ -142,6 +149,7 @@ Kazuki Saitoh kazuki saitoh \n Keith Cascio \n Kent Engstrom \n Kevin Leung \n+Kevin Willford \n Kirill Smelkov \n Kirill Smelkov \n Knut Franke \n@@ -209,6 +217,7 @@ Paul Mackerras \n Paul Mackerras \n Peter Baumann \n Peter Baumann \n+Peter Kaestle \n Peter Krefting \n Peter Krefting \n Petr Baudis \n@@ -256,6 +265,7 @@ Steven Grimm \n Steven Grimm koreth@midwinter.com\n Steven Walter \n Steven Walter \n+Sun Chao <16657101987@163.com>\n Sven Verdoolaege \n Sven Verdoolaege \n SZEDER Gábor \n-- \n2.28.0.277.g9b3c35fffd\n\n"},{"id":"403798","messageId":"xmqqsgcm4ij5.fsf@gitster.c.googlers.com","threadId":"53982","inReplyTo":"20200816153037.1143576-1-martin.agren@gmail.com","subject":"Re: [PATCH v2] Update .mailmap","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-16T17:17:34Z","receivedAt":"2020-08-16T17:27:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> Acked-by: Ed Maste \n> Acked-by: Damien Robert \n\nIt may be a good idea to also add two addresses for Andreas Schwab\nwho already answered that these should not be unified with a comment\nfor documentation purposes, perhaps something along the lines of...\n\n # These two addresses are used on purpose---do not merge.\n Human Readable Name \n Human Readable Name \n\nto help future contributors who want to follow up on your effort.\n\nPerhaps we also may want to have the proposed but not yet acked\nentries in comment for documentation purposes, like so:\n\n # Asked, but not acked yet\n # Human Readable Name0 \n # Human Readable Name1 \n # ...\n\nThanks.\n"}]}