Update .mailmap
cover Update .mailmap
I noticed that there were a couple of duplicate entries in git shortlog -nse v2.19.1.., and then continued a bit to remove the duplicate entries even for v2.10.0..
Johannes Schindelin (1):
Update .mailmap
.mailmap | 13 +++++++++++++ 1 file changed, 13 insertions(+)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-71%2Fdscho%2Fmailmap-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-71/dscho/mailmap-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/71
Signature · 1 line
gitgitgadget
PATCH 1/1 Update .mailmap
From: Johannes Schindelin <[email protected]>
This patch makes the output of git shortlog -nse v2.10.0 duplicate-free.
--- .mailmap | 13 +++++++++++++ 1 file changed, 13 insertions(+)
.mailmap +13 -0
@@ -21,6 +21,8 @@ Anders Kaseorg <[email protected]> <[email protected]> Aneesh Kumar K.V <[email protected]> Amos Waterland <[email protected]> <[email protected]> Amos Waterland <[email protected]> <[email protected]> +Ben Peart <[email protected]> <[email protected]> +Ben Peart <[email protected]> <[email protected]> Ben Walton <[email protected]> <[email protected]> Benoit Sigoure <[email protected]> <[email protected]> Bernt Hansen <[email protected]> <[email protected]>
@@ -32,6 +34,7 @@ Bryan Larsen <[email protected]> <[email protected]> Cheng Renquan <[email protected]> Chris Shoemaker <[email protected]> Chris Wright <[email protected]> <[email protected]> +Christian Ludwig <[email protected]> <[email protected]> Cord Seele <[email protected]> <[email protected]> Christian Couder <[email protected]> <[email protected]> Christian Stimming <[email protected]> <[email protected]>
@@ -51,6 +54,7 @@ David Reiss <[email protected]> <dreiss@dreiss-vmware.(none)> David S. Miller <[email protected]> David Turner <[email protected]> <[email protected]> David Turner <[email protected]> <[email protected]> +Derrick Stolee <[email protected]> <[email protected]> Deskin Miller <[email protected]> Dirk Süsserott <[email protected]> Eric Blake <[email protected]> <[email protected]>
@@ -98,6 +102,7 @@ Jens Axboe <[email protected]> <[email protected]> Jens Lindström <[email protected]> Jens Lindstrom <[email protected]> Jim Meyering <[email protected]> <[email protected]> Joachim Berdal Haga <[email protected]> +Joachim Jablon <[email protected]> <[email protected]> Johannes Schindelin <[email protected]> <[email protected]> Johannes Sixt <[email protected]> <[email protected]> Johannes Sixt <[email protected]> <[email protected]>
@@ -150,6 +155,7 @@ Mark Levedahl <[email protected]> <[email protected]> Mark Rada <[email protected]> Martin Langhoff <[email protected]> <[email protected]> Martin von Zweigbergk <[email protected]> <[email protected]> +Masaya Suzuki <[email protected]><[email protected]> Matt Draisey <[email protected]> <[email protected]> Matt Kraai <[email protected]> <[email protected]> Matt McCutchen <[email protected]> <[email protected]>
@@ -157,6 +163,7 @@ Matthias Kestenholz <[email protected]> <[email protected]> Matthias Rüster <[email protected]> Matthias Ruester Matthias Urlichs <[email protected]> <smurf@kiste.(none)> Matthias Urlichs <[email protected]> <[email protected]> +Matthieu Moy <[email protected]> <[email protected]> Michael Coleman <[email protected]> Michael J Gruber <[email protected]> <[email protected]> Michael J Gruber <[email protected]> <[email protected]>
@@ -180,7 +187,11 @@ Nick Stokoe <[email protected]> Nick Woolley <[email protected]> Nick Stokoe <[email protected]> Nick Woolley <[email protected]> Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> +Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> +Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> +Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> Nicolas Sebrecht <[email protected]> <[email protected]> +Orgad Shaneh <[email protected]> <[email protected]> Paolo Bonzini <[email protected]> <[email protected]> Pascal Obry <[email protected]> <[email protected]> Pascal Obry <[email protected]> <[email protected]>
@@ -200,6 +211,7 @@ Philipp A. Hartmann <[email protected]> <[email protected]> Philippe Bruhat <[email protected]> Ralf Thielow <[email protected]> <[email protected]> Ramsay Jones <[email protected]> <[email protected]> +Randall S. Becker <[email protected]> <[email protected]> René Scharfe <[email protected]> <[email protected]> René Scharfe <[email protected]> Rene Scharfe Richard Hansen <[email protected]> <[email protected]>
@@ -238,6 +250,7 @@ Steven Walter <[email protected]> <[email protected]> Sven Verdoolaege <[email protected]> <[email protected]> Sven Verdoolaege <[email protected]> <[email protected]> SZEDER Gábor <[email protected]> <[email protected]> +Tao Qingyun <[email protected]> <[email protected]> Tay Ray Chuan <[email protected]> Ted Percival <[email protected]> <[email protected]> Theodore Ts'o <[email protected]>
Signature · 1 line
gitgitgadget
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 4 lines · writes:
From: Johannes Schindelin <[email protected]>
This patch makes the output of
git shortlog -nse v2.10.0duplicate-free.
Did you mean "v2.10.0..master" or did you really mean this covers authors recorded up to v2.10.0? Judging from the cover letter, I think you meant the former.
Can you say a bit more about how one among multiple addresses for each person was chosen in the log message? E.g. "After asking each author which one is the preferred one", "Picked the one with the most recent committer timestamps", "There were two for each but one of them were bouncing", etc.
.mailmap Mark Levedahl <[email protected]> <[email protected]> · line 158
Quoted 5 lines
.mailmap +1
-0@@ -150,6 +155,7 @@ Mark Levedahl <[email protected]> <[email protected]> Mark Rada <[email protected]> Martin Langhoff <[email protected]> <[email protected]> Martin von Zweigbergk <[email protected]> <[email protected]> +Masaya Suzuki <[email protected]><[email protected]>
It is a bit surprising that we can take an entry without SP in between two addresses and still behave sensibley, but it probably makes more sense to add one just to look similar to other entries.
Thanks for working on this.
Hi Junio,
Quoted 11 lines · Junio C Hamano
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 4 lines · writes:
From: Johannes Schindelin <[email protected]>
This patch makes the output of
git shortlog -nse v2.10.0duplicate-free.Did you mean "v2.10.0..master" or did you really mean this covers authors recorded up to v2.10.0? Judging from the cover letter, I think you meant the former.
D'oh. Yes, I meant v2.10.0..master.
Quoted 5 lines
Can you say a bit more about how one among multiple addresses for each person was chosen in the log message? E.g. "After asking each author which one is the preferred one", "Picked the one with the most recent committer timestamps", "There were two for each but one of them were bouncing", etc.
I looked at each of the authors' mails and tried to determine which one was the preferred one. For example, Masaya sent a patch from their gmail account but signed off using their google account, so I figured the latter was preferable. Nicolas, on the other hand, already had a couple of entries in .mailmap, so I picked the one that seemed to be preferred judging by the .mailmap even if it was not in use lately.
For Christian, it was gmail vs googlemail, and I picked the former, as it is more common these days.
For Ben and Stolee, I used their Microsoft accounts (preferring the one Ben used originally).
For Joachim, Matthieu, Randall and Tao, I used the more personalized email address.
For Orgad, I used his personal one rather than his work email.
Quoted 9 lines
.mailmap Mark Levedahl <[email protected]> <[email protected]> · line 158
Quoted 5 lines
.mailmap +1
-0@@ -150,6 +155,7 @@ Mark Levedahl <[email protected]> <[email protected]> Mark Rada <[email protected]> Martin Langhoff <[email protected]> <[email protected]> Martin von Zweigbergk <[email protected]> <[email protected]> +Masaya Suzuki <[email protected]><[email protected]>It is a bit surprising that we can take an entry without SP in between two addresses and still behave sensibley, but it probably makes more sense to add one just to look similar to other entries.
Whoops. Thanks, fixed!
Quoted 1 line
Thanks for working on this.
You're welcome.
v2 about to be sent,
Dscho
v2 cover Update .mailmap
In reply to Johannes Schindelin via GitGitGadgetI noticed that there were a couple of duplicate entries in git shortlog -nse v2.19.1.., and then continued a bit to remove the duplicate entries even for v2.10.0..
Changes relative to v1:
* Fixed the commit message (it talked about the opposite commit range than intended).
* Added a formerly missing space between the email addresses of Masaya.
Johannes Schindelin (1):
Update .mailmap
.mailmap | 13 +++++++++++++ 1 file changed, 13 insertions(+)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-71%2Fdscho%2Fmailmap-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-71/dscho/mailmap-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/71
Range-diff vs v1:
1: b590a9bebf ! 1: c121ebc474 Update .mailmap
@@ -2,7 +2,7 @@
Update .mailmap
- This patch makes the output of git shortlog -nse v2.10.0
+ This patch makes the output of git shortlog -nse v2.10.0..master
duplicate-free.
@@ -47,7 +47,7 @@
Mark Rada <[email protected]>
Martin Langhoff <[email protected]> <[email protected]> Martin von Zweigbergk <[email protected]> <[email protected]>
-+Masaya Suzuki <[email protected]><[email protected]> ++Masaya Suzuki <[email protected]> <[email protected]>
Matt Draisey <[email protected]> <[email protected]>
Matt Kraai <[email protected]> <[email protected]>
Matt McCutchen <[email protected]> <[email protected]>
Signature · 1 line
gitgitgadget
PATCH v2 1/1 Update .mailmap
From: Johannes Schindelin <[email protected]>
This patch makes the output of git shortlog -nse v2.10.0..master duplicate-free.
--- .mailmap | 13 +++++++++++++ 1 file changed, 13 insertions(+)
.mailmap +13 -0
@@ -21,6 +21,8 @@ Anders Kaseorg <[email protected]> <[email protected]> Aneesh Kumar K.V <[email protected]> Amos Waterland <[email protected]> <[email protected]> Amos Waterland <[email protected]> <[email protected]> +Ben Peart <[email protected]> <[email protected]> +Ben Peart <[email protected]> <[email protected]> Ben Walton <[email protected]> <[email protected]> Benoit Sigoure <[email protected]> <[email protected]> Bernt Hansen <[email protected]> <[email protected]>
@@ -32,6 +34,7 @@ Bryan Larsen <[email protected]> <[email protected]> Cheng Renquan <[email protected]> Chris Shoemaker <[email protected]> Chris Wright <[email protected]> <[email protected]> +Christian Ludwig <[email protected]> <[email protected]> Cord Seele <[email protected]> <[email protected]> Christian Couder <[email protected]> <[email protected]> Christian Stimming <[email protected]> <[email protected]>
@@ -51,6 +54,7 @@ David Reiss <[email protected]> <dreiss@dreiss-vmware.(none)> David S. Miller <[email protected]> David Turner <[email protected]> <[email protected]> David Turner <[email protected]> <[email protected]> +Derrick Stolee <[email protected]> <[email protected]> Deskin Miller <[email protected]> Dirk Süsserott <[email protected]> Eric Blake <[email protected]> <[email protected]>
@@ -98,6 +102,7 @@ Jens Axboe <[email protected]> <[email protected]> Jens Lindström <[email protected]> Jens Lindstrom <[email protected]> Jim Meyering <[email protected]> <[email protected]> Joachim Berdal Haga <[email protected]> +Joachim Jablon <[email protected]> <[email protected]> Johannes Schindelin <[email protected]> <[email protected]> Johannes Sixt <[email protected]> <[email protected]> Johannes Sixt <[email protected]> <[email protected]>
@@ -150,6 +155,7 @@ Mark Levedahl <[email protected]> <[email protected]> Mark Rada <[email protected]> Martin Langhoff <[email protected]> <[email protected]> Martin von Zweigbergk <[email protected]> <[email protected]> +Masaya Suzuki <[email protected]> <[email protected]> Matt Draisey <[email protected]> <[email protected]> Matt Kraai <[email protected]> <[email protected]> Matt McCutchen <[email protected]> <[email protected]>
@@ -157,6 +163,7 @@ Matthias Kestenholz <[email protected]> <[email protected]> Matthias Rüster <[email protected]> Matthias Ruester Matthias Urlichs <[email protected]> <smurf@kiste.(none)> Matthias Urlichs <[email protected]> <[email protected]> +Matthieu Moy <[email protected]> <[email protected]> Michael Coleman <[email protected]> Michael J Gruber <[email protected]> <[email protected]> Michael J Gruber <[email protected]> <[email protected]>
@@ -180,7 +187,11 @@ Nick Stokoe <[email protected]> Nick Woolley <[email protected]> Nick Stokoe <[email protected]> Nick Woolley <[email protected]> Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> +Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> +Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> +Nicolas Morey-Chaisemartin <[email protected]> <[email protected]> Nicolas Sebrecht <[email protected]> <[email protected]> +Orgad Shaneh <[email protected]> <[email protected]> Paolo Bonzini <[email protected]> <[email protected]> Pascal Obry <[email protected]> <[email protected]> Pascal Obry <[email protected]> <[email protected]>
@@ -200,6 +211,7 @@ Philipp A. Hartmann <[email protected]> <[email protected]> Philippe Bruhat <[email protected]> Ralf Thielow <[email protected]> <[email protected]> Ramsay Jones <[email protected]> <[email protected]> +Randall S. Becker <[email protected]> <[email protected]> René Scharfe <[email protected]> <[email protected]> René Scharfe <[email protected]> Rene Scharfe Richard Hansen <[email protected]> <[email protected]>
@@ -238,6 +250,7 @@ Steven Walter <[email protected]> <[email protected]> Sven Verdoolaege <[email protected]> <[email protected]> Sven Verdoolaege <[email protected]> <[email protected]> SZEDER Gábor <[email protected]> <[email protected]> +Tao Qingyun <[email protected]> <[email protected]> Tay Ray Chuan <[email protected]> Ted Percival <[email protected]> <[email protected]> Theodore Ts'o <[email protected]>
Signature · 1 line
gitgitgadget
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 7 lines · writes:
From: Johannes Schindelin <[email protected]>
This patch makes the output of
git shortlog -nse v2.10.0..masterduplicate-free.Signed-off-by Johannes Schindelin <[email protected]>---
Thanks, will queue.