{"thread":{"id":"49782","subject":"[PATCH 1/1] Update .mailmap","startedAt":"2018-11-08T17:08:13Z","lastAt":"2018-11-12T03:54:47Z","messageCount":7,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"362743","messageId":"b590a9bebf8ac10b6f1d85287bb8d7a8ac7082a6.1541696887.git.gitgitgadget@gmail.com","threadId":"49782","inReplyTo":"pull.71.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] Update .mailmap","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2018-11-08T17:08:09Z","receivedAt":"2018-11-08T17:08:13Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThis patch makes the output of `git shortlog -nse v2.10.0`\nduplicate-free.\n\nSigned-off-by: Johannes Schindelin \n---\n .mailmap | 13 +++++++++++++\n 1 file changed, 13 insertions(+)\n\ndiff --git a/.mailmap b/.mailmap\nindex bef3352b0d..1d8310073a 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -21,6 +21,8 @@ Anders Kaseorg \n Aneesh Kumar K.V \n Amos Waterland \n Amos Waterland \n+Ben Peart \n+Ben Peart \n Ben Walton \n Benoit Sigoure \n Bernt Hansen \n@@ -32,6 +34,7 @@ Bryan Larsen \n Cheng Renquan \n Chris Shoemaker \n Chris Wright \n+Christian Ludwig \n Cord Seele \n Christian Couder \n Christian Stimming \n@@ -51,6 +54,7 @@ David Reiss \n David S. Miller \n David Turner \n David Turner \n+Derrick Stolee \n Deskin Miller \n Dirk Süsserott \n Eric Blake \n@@ -98,6 +102,7 @@ Jens Axboe \n Jens Lindström Jens Lindstrom \n Jim Meyering \n Joachim Berdal Haga \n+Joachim Jablon \n Johannes Schindelin \n Johannes Sixt \n Johannes Sixt \n@@ -150,6 +155,7 @@ Mark Levedahl \n Mark Rada \n Martin Langhoff \n Martin von Zweigbergk \n+Masaya Suzuki \n Matt Draisey \n Matt Kraai \n Matt McCutchen \n@@ -157,6 +163,7 @@ Matthias Kestenholz \n Matthias Rüster Matthias Ruester\n Matthias Urlichs \n Matthias Urlichs \n+Matthieu Moy \n Michael Coleman \n Michael J Gruber \n Michael J Gruber \n@@ -180,7 +187,11 @@ Nick Stokoe Nick Woolley \n Nick Stokoe Nick Woolley \n Nicolas Morey-Chaisemartin \n Nicolas Morey-Chaisemartin \n+Nicolas Morey-Chaisemartin \n+Nicolas Morey-Chaisemartin \n+Nicolas Morey-Chaisemartin \n Nicolas Sebrecht \n+Orgad Shaneh \n Paolo Bonzini \n Pascal Obry \n Pascal Obry \n@@ -200,6 +211,7 @@ Philipp A. Hartmann \n Philippe Bruhat \n Ralf Thielow \n Ramsay Jones \n+Randall S. Becker \n René Scharfe \n René Scharfe Rene Scharfe\n Richard Hansen \n@@ -238,6 +250,7 @@ Steven Walter \n Sven Verdoolaege \n Sven Verdoolaege \n SZEDER Gábor \n+Tao Qingyun <845767657@qq.com>\n Tay Ray Chuan \n Ted Percival \n Theodore Ts'o \n-- \ngitgitgadget\n"},{"id":"362744","messageId":"pull.71.git.gitgitgadget@gmail.com","threadId":"49782","inReplyTo":null,"subject":"[PATCH 0/1] Update .mailmap","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2018-11-08T17:08:08Z","receivedAt":"2018-11-08T17:08:13Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"I noticed that there were a couple of duplicate entries in git shortlog -nse\nv2.19.1.., and then continued a bit to remove the duplicate entries even for\nv2.10.0..\n\nJohannes Schindelin (1):\n Update .mailmap\n\n .mailmap | 13 +++++++++++++\n 1 file changed, 13 insertions(+)\n\n\nbase-commit: 8858448bb49332d353febc078ce4a3abcc962efe\nPublished-As: https://github.com/gitgitgadget/git/releases/tags/pr-71%2Fdscho%2Fmailmap-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-71/dscho/mailmap-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/71\n-- \ngitgitgadget\n"},{"id":"362767","messageId":"xmqq5zx76k67.fsf@gitster-ct.c.googlers.com","threadId":"49782","inReplyTo":"b590a9bebf8ac10b6f1d85287bb8d7a8ac7082a6.1541696887.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] Update .mailmap","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-11-09T02:48:00Z","receivedAt":"2018-11-09T02:50:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> This patch makes the output of `git shortlog -nse v2.10.0`\n> duplicate-free.\n\nDid you mean \"v2.10.0..master\" or did you really mean this covers\nauthors recorded up to v2.10.0? Judging from the cover letter, I\nthink you meant the former.\n\nCan you say a bit more about how one among multiple addresses for\neach person was chosen in the log message? E.g. \"After asking each\nauthor which one is the preferred one\", \"Picked the one with the\nmost recent committer timestamps\", \"There were two for each but one\nof them were bouncing\", etc.\n\n> @@ -150,6 +155,7 @@ Mark Levedahl \n> Mark Rada \n> Martin Langhoff \n> Martin von Zweigbergk \n> +Masaya Suzuki \n\nIt is a bit surprising that we can take an entry without SP in\nbetween two addresses and still behave sensibley, but it probably\nmakes more sense to add one just to look similar to other entries.\n\nThanks for working on this.\n"},{"id":"362818","messageId":"nycvar.QRO.7.76.6.1811091216490.39@tvgsbejvaqbjf.bet","threadId":"49782","inReplyTo":"xmqq5zx76k67.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] Update .mailmap","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-11-09T11:29:28Z","receivedAt":"2018-11-09T11:29:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 9 Nov 2018, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n> \n> > From: Johannes Schindelin \n> >\n> > This patch makes the output of `git shortlog -nse v2.10.0`\n> > duplicate-free.\n> \n> Did you mean \"v2.10.0..master\" or did you really mean this covers\n> authors recorded up to v2.10.0? Judging from the cover letter, I\n> think you meant the former.\n\nD'oh. Yes, I meant v2.10.0..master.\n\n> Can you say a bit more about how one among multiple addresses for\n> each person was chosen in the log message? E.g. \"After asking each\n> author which one is the preferred one\", \"Picked the one with the\n> most recent committer timestamps\", \"There were two for each but one\n> of them were bouncing\", etc.\n\nI looked at each of the authors' mails and tried to determine which one\nwas the preferred one. For example, Masaya sent a patch from their gmail\naccount but signed off using their google account, so I figured the latter\nwas preferable. Nicolas, on the other hand, already had a couple of\nentries in .mailmap, so I picked the one that seemed to be preferred\njudging by the .mailmap even if it was not in use lately.\n\nFor Christian, it was gmail vs googlemail, and I picked the former, as it\nis more common these days.\n\nFor Ben and Stolee, I used their Microsoft accounts (preferring the one\nBen used originally).\n\nFor Joachim, Matthieu, Randall and Tao, I used the more personalized email\naddress.\n\nFor Orgad, I used his personal one rather than his work email.\n\n> > @@ -150,6 +155,7 @@ Mark Levedahl \n> > Mark Rada \n> > Martin Langhoff \n> > Martin von Zweigbergk \n> > +Masaya Suzuki \n> \n> It is a bit surprising that we can take an entry without SP in\n> between two addresses and still behave sensibley, but it probably\n> makes more sense to add one just to look similar to other entries.\n\nWhoops. Thanks, fixed!\n\n> Thanks for working on this.\n\nYou're welcome.\n\nv2 about to be sent,\nDscho\n"},{"id":"362819","messageId":"pull.71.v2.git.gitgitgadget@gmail.com","threadId":"49782","inReplyTo":"pull.71.git.gitgitgadget@gmail.com","subject":"[PATCH v2 0/1] Update .mailmap","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2018-11-09T11:31:13Z","receivedAt":"2018-11-09T11:31:16Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"I noticed that there were a couple of duplicate entries in git shortlog -nse\nv2.19.1.., and then continued a bit to remove the duplicate entries even for\nv2.10.0..\n\nChanges relative to v1:\n\n * Fixed the commit message (it talked about the opposite commit range than\n intended).\n * Added a formerly missing space between the email addresses of Masaya.\n\nJohannes Schindelin (1):\n Update .mailmap\n\n .mailmap | 13 +++++++++++++\n 1 file changed, 13 insertions(+)\n\n\nbase-commit: 8858448bb49332d353febc078ce4a3abcc962efe\nPublished-As: https://github.com/gitgitgadget/git/releases/tags/pr-71%2Fdscho%2Fmailmap-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-71/dscho/mailmap-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/71\n\nRange-diff vs v1:\n\n 1: b590a9bebf ! 1: c121ebc474 Update .mailmap\n @@ -2,7 +2,7 @@\n \n Update .mailmap\n \n - This patch makes the output of `git shortlog -nse v2.10.0`\n + This patch makes the output of `git shortlog -nse v2.10.0..master`\n duplicate-free.\n \n Signed-off-by: Johannes Schindelin \n @@ -47,7 +47,7 @@\n Mark Rada \n Martin Langhoff \n Martin von Zweigbergk \n -+Masaya Suzuki \n ++Masaya Suzuki \n Matt Draisey \n Matt Kraai \n Matt McCutchen \n\n-- \ngitgitgadget\n"},{"id":"362820","messageId":"c121ebc47428077ec30fd6f0c724fd99f81387f6.1541763071.git.gitgitgadget@gmail.com","threadId":"49782","inReplyTo":"pull.71.v2.git.gitgitgadget@gmail.com","subject":"[PATCH v2 1/1] Update .mailmap","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2018-11-09T11:31:14Z","receivedAt":"2018-11-09T11:31:18Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThis patch makes the output of `git shortlog -nse v2.10.0..master`\nduplicate-free.\n\nSigned-off-by: Johannes Schindelin \n---\n .mailmap | 13 +++++++++++++\n 1 file changed, 13 insertions(+)\n\ndiff --git a/.mailmap b/.mailmap\nindex bef3352b0d..eb7b5fc7b9 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -21,6 +21,8 @@ Anders Kaseorg \n Aneesh Kumar K.V \n Amos Waterland \n Amos Waterland \n+Ben Peart \n+Ben Peart \n Ben Walton \n Benoit Sigoure \n Bernt Hansen \n@@ -32,6 +34,7 @@ Bryan Larsen \n Cheng Renquan \n Chris Shoemaker \n Chris Wright \n+Christian Ludwig \n Cord Seele \n Christian Couder \n Christian Stimming \n@@ -51,6 +54,7 @@ David Reiss \n David S. Miller \n David Turner \n David Turner \n+Derrick Stolee \n Deskin Miller \n Dirk Süsserott \n Eric Blake \n@@ -98,6 +102,7 @@ Jens Axboe \n Jens Lindström Jens Lindstrom \n Jim Meyering \n Joachim Berdal Haga \n+Joachim Jablon \n Johannes Schindelin \n Johannes Sixt \n Johannes Sixt \n@@ -150,6 +155,7 @@ Mark Levedahl \n Mark Rada \n Martin Langhoff \n Martin von Zweigbergk \n+Masaya Suzuki \n Matt Draisey \n Matt Kraai \n Matt McCutchen \n@@ -157,6 +163,7 @@ Matthias Kestenholz \n Matthias Rüster Matthias Ruester\n Matthias Urlichs \n Matthias Urlichs \n+Matthieu Moy \n Michael Coleman \n Michael J Gruber \n Michael J Gruber \n@@ -180,7 +187,11 @@ Nick Stokoe Nick Woolley \n Nick Stokoe Nick Woolley \n Nicolas Morey-Chaisemartin \n Nicolas Morey-Chaisemartin \n+Nicolas Morey-Chaisemartin \n+Nicolas Morey-Chaisemartin \n+Nicolas Morey-Chaisemartin \n Nicolas Sebrecht \n+Orgad Shaneh \n Paolo Bonzini \n Pascal Obry \n Pascal Obry \n@@ -200,6 +211,7 @@ Philipp A. Hartmann \n Philippe Bruhat \n Ralf Thielow \n Ramsay Jones \n+Randall S. Becker \n René Scharfe \n René Scharfe Rene Scharfe\n Richard Hansen \n@@ -238,6 +250,7 @@ Steven Walter \n Sven Verdoolaege \n Sven Verdoolaege \n SZEDER Gábor \n+Tao Qingyun <845767657@qq.com>\n Tay Ray Chuan \n Ted Percival \n Theodore Ts'o \n-- \ngitgitgadget\n"},{"id":"362959","messageId":"xmqq7ehj3q7x.fsf@gitster-ct.c.googlers.com","threadId":"49782","inReplyTo":"c121ebc47428077ec30fd6f0c724fd99f81387f6.1541763071.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 1/1] Update .mailmap","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-11-12T03:54:42Z","receivedAt":"2018-11-12T03:54:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> This patch makes the output of `git shortlog -nse v2.10.0..master`\n> duplicate-free.\n>\n> Signed-off-by: Johannes Schindelin \n> ---\n\nThanks, will queue.\n"}]}