mailmap: Clean up
cover mailmap: Clean up
Trivial cleanup of .mailmap to have a nice 'git shortlog' output.
Philippe Mathieu-Daudé (3):
mailmap: Reorder by sections
mailmap: Update philmd email address
mailmap: Add many entries to improve 'git shortlog' statistics
.mailmap | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 8 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 mailmap: Reorder by sections
Our mailmap currently has 4 sections somehow documented. Reorder few entries not related to "addresses from the original git import" into the 3rd section, and add a comment to describe it.
--- .mailmap | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
.mailmap +9 -8
@@ -4,20 +4,12 @@ # into proper addresses so that they are counted properly by git shortlog. Andrzej Zaborowski <[email protected]> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Anthony Liguori <[email protected]> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> -Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> Aurelien Jarno <[email protected]> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> Blue Swirl <[email protected]> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Edgar E. Iglesias <[email protected]> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Fabrice Bellard <[email protected]> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> -James Hogan <[email protected]> <[email protected]> Jocelyn Mayer <[email protected]> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> -Yongbok Kim <[email protected]> <[email protected]> -Aleksandar Markovic <[email protected]> <[email protected]> -Aleksandar Markovic <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
@@ -32,6 +24,15 @@ Ian McKellar <[email protected]> Ian McKellar via Qemu-devel <qemu-devel@nongnu Julia Suvorova <[email protected]> Julia Suvorova via Qemu-devel <[email protected]> Justin Terry (VM) <[email protected]> Justin Terry (VM) via Qemu-devel <[email protected]> +# Next, replace old addresses by a more recent one. +Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> +James Hogan <[email protected]> <[email protected]> +Aleksandar Markovic <[email protected]> <[email protected]> +Aleksandar Markovic <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Yongbok Kim <[email protected]> <[email protected]> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues.
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections
23.08.2019. 01.13, "Philippe Mathieu-Daudé" <[email protected]> је написао/ла:
Quoted 8 lines
Our mailmap currently has 4 sections somehow documented. Reorder few entries not related to "addresses from the original git import" into the 3rd section, and add a comment to describe it.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Just for the sake of tidiness, consider alphabetically ordering items in the new section. (This would've been a challenge though if we had had many Chinese contributors... :) ) In any case:
.mailmap line 4
Quoted 9 lines
.mailmap | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-).mailmap +0
-0@@ -4,20 +4,12 @@ # into proper addresses so that they are counted properly by git
shortlog.
.mailmap line 5
Quoted 1 line
.mailmap +0
-0Andrzej Zaborowski <[email protected]> balrog
<balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 6
Quoted 1 line
.mailmap +0
-0Anthony Liguori <[email protected]> aliguori
<aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 7
Quoted 1 line
.mailmap +0
-1-Anthony Liguori <[email protected]> Anthony Liguori <
.mailmap line 7
Quoted 1 line
.mailmap +0
-0Aurelien Jarno <[email protected]> aurel32
<aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 8
Quoted 1 line
.mailmap +0
-0Blue Swirl <[email protected]> blueswir1
<blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 9
Quoted 1 line
.mailmap +0
-0Edgar E. Iglesias <[email protected]> edgar_igl
<edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 10
Quoted 1 line
.mailmap +0
-0Fabrice Bellard <[email protected]> bellard
<bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 11
Quoted 2 lines
.mailmap +0
-1-James Hogan <[email protected]> <[email protected]> Jocelyn Mayer <[email protected]> j_mayer
<j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 12
Quoted 1 line
.mailmap +0
-0Paul Brook <[email protected]> pbrook
<pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap line 16
Quoted 2 lines
.mailmap +0
-2-Yongbok Kim <[email protected]> <[email protected]> -Aleksandar Markovic <[email protected]> <
.mailmap line 17
Quoted 1 line
.mailmap +0
-1-Aleksandar Markovic <[email protected]> <
.mailmap
Quoted 4 lines
.mailmap +0
-3-Paul Burton <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> -Paul Burton <[email protected]> <[email protected]> Thiemo Seufer <[email protected]> ths
<ths@c046a42c-6fe2-441c-8c8c-71466251a162>
.mailmap Ian McKellar <[email protected]> Ian McKellar via
Quoted 3 lines
.mailmap +0
-0malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>@@ -32,6 +24,15 @@ Ian McKellar <[email protected]> Ian McKellar via
Qemu-devel <qemu-devel@nongnu
.mailmap Ian McKellar <[email protected]> Ian McKellar via · line 24
Quoted 1 line
.mailmap +0
-0Julia Suvorova <[email protected]> Julia Suvorova via Qemu-devel <
.mailmap Ian McKellar <[email protected]> Ian McKellar via · line 25
Quoted 1 line
.mailmap +0
-0Justin Terry (VM) <[email protected]> Justin Terry (VM) via
Qemu-devel <[email protected]>
.mailmap Ian McKellar <[email protected]> Ian McKellar via · line 27
Quoted 3 lines
.mailmap +2
-0+# Next, replace old addresses by a more recent one. +Anthony Liguori <[email protected]> Anthony Liguori <
.mailmap Ian McKellar <[email protected]> Ian McKellar via · line 29
Quoted 2 lines
.mailmap +2
-0+James Hogan <[email protected]> <[email protected]> +Aleksandar Markovic <[email protected]> <
.mailmap Ian McKellar <[email protected]> Ian McKellar via · line 30
Quoted 1 line
.mailmap +1
-0+Aleksandar Markovic <[email protected]> <
Quoted 11 lines
.mailmap +4
-1+Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Paul Burton <[email protected]> <[email protected]> +Yongbok Kim <[email protected]> <[email protected]> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. --2.20.1
PATCH 2/3 mailmap: Update philmd email address
In reply to Philippe Mathieu-DaudéUse the email address where I spend most of my time.
--- .mailmap | 1 + 1 file changed, 1 insertion(+)
.mailmap +1 -0
@@ -32,6 +32,7 @@ Aleksandar Markovic <[email protected]> <[email protected]> Paul Burton <[email protected]> <[email protected]> Paul Burton <[email protected]> <[email protected]> Paul Burton <[email protected]> <[email protected]> +Philippe Mathieu-Daudé <[email protected]> <[email protected]> Yongbok Kim <[email protected]> <[email protected]> # Also list preferred name forms where people have changed their
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH 2/3] mailmap: Update philmd email address
23.08.2019. 01.10, "Philippe Mathieu-Daudé" <[email protected]> је написао/ла:
Quoted 6 lines
Use the email address where I spend most of my time.
Suggested-by Daniel P. Berrangé <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
.mailmap Aleksandar Markovic <[email protected]> <
Quoted 8 lines
.mailmap | 1 + 1 file changed, 1 insertion(+).mailmap +0
-0@@ -32,6 +32,7 @@ Aleksandar Markovic <[email protected]> <
Quoted 11 lines
.mailmap +1
-1Paul Burton <[email protected]> <[email protected]> Paul Burton <[email protected]> <[email protected]> Paul Burton <[email protected]> <[email protected]> +Philippe Mathieu-Daudé <[email protected]> <[email protected]> Yongbok Kim <[email protected]> <[email protected]> # Also list preferred name forms where people have changed their --2.20.1
PATCH 3/3 mailmap: Add many entries to improve 'git shortlog' statistics
In reply to Philippe Mathieu-DaudéAll of these emails have a least 1 commit with utf8/latin1 encoding issue, or one with no author name.
When there are multiple commits, keep the author name the most used.
--- .mailmap | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+)
.mailmap +105 -0
@@ -37,5 +37,110 @@ Yongbok Kim <[email protected]> <[email protected]> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. +Aaron Lindsay <[email protected]> +Alexey Gerasimenko <[email protected]> +Alex Ivanov <[email protected]> +Andreas Färber <[email protected]> +Bandan Das <[email protected]> +Benjamin MARSILI <[email protected]> +Benoît Canet <[email protected]> +Benoît Canet <[email protected]> +Benoît Canet <[email protected]> +Boqun Feng <[email protected]> +Boqun Feng <[email protected]> +Brad Smith <[email protected]> +Brijesh Singh <[email protected]> +Brilly Wu <[email protected]> +Cédric Vincent <[email protected]> +CheneyLin <[email protected]> +Chen Gang <[email protected]> +Chen Gang <[email protected]> +Chen Gang <[email protected]> +Chen Wei-Ren <[email protected]> +Christophe Lyon <[email protected]> +Collin L. Walling <[email protected]> Daniel P. Berrangé <[email protected]> +Eduardo Otubo <[email protected]> +Fabrice Desclaux <[email protected]> +Fernando Luis Vázquez Cao <[email protected]> +Fernando Luis Vázquez Cao <[email protected]> +Gautham R. Shenoy <[email protected]> +Gautham R. Shenoy <[email protected]> +Gonglei (Arei) <[email protected]> +Guang Wang <[email protected]> +Hailiang Zhang <[email protected]> +Hervé Poussineau <[email protected]> +Jakub Jermář <[email protected]> +Jakub Jermář <[email protected]> +Jean-Christophe Dubois <[email protected]> +Jindřich Makovička <[email protected]> +John Arbuckle <[email protected]> +Juha Riihimäki <[email protected]> +Juha Riihimäki <[email protected]> +Jun Li <[email protected]> +Laurent Vivier <[email protected]> +Leandro Lupori <[email protected]> +Li Guang <[email protected]> +Liming Wang <[email protected]> +linzhecheng <[email protected]> +Liran Schour <[email protected]> +Liu Yu <[email protected]> +Liu Yu <[email protected]> +Li Zhang <[email protected]> +Li Zhang <[email protected]> +Lluís Vilanova <[email protected]> +Lluís Vilanova <[email protected]> +Longpeng (Mike) <[email protected]> +Luc Michel <[email protected]> +Luc Michel <[email protected]> +Marc Marí <[email protected]> +Marc Marí <[email protected]> +Michael Avdienko <[email protected]> +Michael S. Tsirkin <[email protected]> +Munkyu Im <[email protected]> +Nicholas Bellinger <[email protected]> +Nicholas Thomas <[email protected]> +Nikunj A Dadhania <[email protected]> +Orit Wasserman <[email protected]> +Paolo Bonzini <[email protected]> +Pavel Dovgaluk <[email protected]> +Pavel Dovgaluk <[email protected]> +Pavel Dovgaluk <[email protected]> +Peter Crosthwaite <[email protected]> +Peter Crosthwaite <[email protected]> +Peter Crosthwaite <[email protected]> +Prasad J Pandit <[email protected]> +Prasad J Pandit <[email protected]> +Qiao Nuohan <[email protected]> Reimar Döffinger <[email protected]> +Remy Noel <[email protected]> +Roger Pau Monné <[email protected]> +Shin'ichiro Kawasaki <[email protected]> +Shin'ichiro Kawasaki <[email protected]> +Sochin Jiang <[email protected]> +Takashi Yoshii <[email protected]> +Thomas Huth <[email protected]> +Thomas Knych <[email protected]> +Timothy Baldwin <[email protected]> +Tony Nguyen <[email protected]> +Venkateswararao Jujjuri <[email protected]> +Vibi Sreenivasan <[email protected]> +Vijaya Kumar K <[email protected]> +Vijaya Kumar K <[email protected]> +Vijay Kumar <[email protected]> +Vijay Kumar <[email protected]> +Wang Guang <[email protected]> +Wenchao Xia <[email protected]> +Wenshuang Ma <[email protected]> +Xiaoqiang Zhao <[email protected]> +Xinhua Cao <[email protected]> +Xiong Zhang <[email protected]> +Yin Yin <[email protected]> +yuchenlin <[email protected]> +YunQiang Su <[email protected]> +YunQiang Su <[email protected]> +Yuri Pudgorodskiy <[email protected]> +Zhengui Li <[email protected]> +Zhenwei Pi <[email protected]> +Zhenwei Pi <[email protected]> +Zhuang Yanying <[email protected]>
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics
23.08.2019. 01.10, "Philippe Mathieu-Daudé" <[email protected]> је написао/ла:
Quoted 7 lines
All of these emails have a least 1 commit with utf8/latin1 encoding issue, or one with no author name.
When there are multiple commits, keep the author name the most used.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Out of the scope of this patch, what about the cases like Mateja Marjanovic, who contributed with both [email protected] and [email protected] ?
.mailmap Yongbok Kim <[email protected]> <
Quoted 8 lines
.mailmap | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+).mailmap +0
-0@@ -37,5 +37,110 @@ Yongbok Kim <[email protected]> <
Quoted 114 lines
.mailmap +105
-1# Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. +Aaron Lindsay <[email protected]> +Alexey Gerasimenko <[email protected]> +Alex Ivanov <[email protected]> +Andreas Färber <[email protected]> +Bandan Das <[email protected]> +Benjamin MARSILI <[email protected]> +Benoît Canet <[email protected]> +Benoît Canet <[email protected]> +Benoît Canet <[email protected]> +Boqun Feng <[email protected]> +Boqun Feng <[email protected]> +Brad Smith <[email protected]> +Brijesh Singh <[email protected]> +Brilly Wu <[email protected]> +Cédric Vincent <[email protected]> +CheneyLin <[email protected]> +Chen Gang <[email protected]> +Chen Gang <[email protected]> +Chen Gang <[email protected]> +Chen Wei-Ren <[email protected]> +Christophe Lyon <[email protected]> +Collin L. Walling <[email protected]> Daniel P. Berrangé <[email protected]> +Eduardo Otubo <[email protected]> +Fabrice Desclaux <[email protected]> +Fernando Luis Vázquez Cao <[email protected]> +Fernando Luis Vázquez Cao <[email protected]> +Gautham R. Shenoy <[email protected]> +Gautham R. Shenoy <[email protected]> +Gonglei (Arei) <[email protected]> +Guang Wang <[email protected]> +Hailiang Zhang <[email protected]> +Hervé Poussineau <[email protected]> +Jakub Jermář <[email protected]> +Jakub Jermář <[email protected]> +Jean-Christophe Dubois <[email protected]> +Jindřich Makovička <[email protected]> +John Arbuckle <[email protected]> +Juha Riihimäki <[email protected]> +Juha Riihimäki <[email protected]> +Jun Li <[email protected]> +Laurent Vivier <[email protected]> +Leandro Lupori <[email protected]> +Li Guang <[email protected]> +Liming Wang <[email protected]> +linzhecheng <[email protected]> +Liran Schour <[email protected]> +Liu Yu <[email protected]> +Liu Yu <[email protected]> +Li Zhang <[email protected]> +Li Zhang <[email protected]> +Lluís Vilanova <[email protected]> +Lluís Vilanova <[email protected]> +Longpeng (Mike) <[email protected]> +Luc Michel <[email protected]> +Luc Michel <[email protected]> +Marc Marí <[email protected]> +Marc Marí <[email protected]> +Michael Avdienko <[email protected]> +Michael S. Tsirkin <[email protected]> +Munkyu Im <[email protected]> +Nicholas Bellinger <[email protected]> +Nicholas Thomas <[email protected]> +Nikunj A Dadhania <[email protected]> +Orit Wasserman <[email protected]> +Paolo Bonzini <[email protected]> +Pavel Dovgaluk <[email protected]> +Pavel Dovgaluk <[email protected]> +Pavel Dovgaluk <[email protected]> +Peter Crosthwaite <[email protected]> +Peter Crosthwaite <[email protected]> +Peter Crosthwaite <[email protected]> +Prasad J Pandit <[email protected]> +Prasad J Pandit <[email protected]> +Qiao Nuohan <[email protected]> Reimar Döffinger <[email protected]> +Remy Noel <[email protected]> +Roger Pau Monné <[email protected]> +Shin'ichiro Kawasaki <[email protected]> +Shin'ichiro Kawasaki <[email protected]> +Sochin Jiang <[email protected]> +Takashi Yoshii <[email protected]> +Thomas Huth <[email protected]> +Thomas Knych <[email protected]> +Timothy Baldwin <[email protected]> +Tony Nguyen <[email protected]> +Venkateswararao Jujjuri <[email protected]> +Vibi Sreenivasan <[email protected]> +Vijaya Kumar K <[email protected]> +Vijaya Kumar K <[email protected]> +Vijay Kumar <[email protected]> +Vijay Kumar <[email protected]> +Wang Guang <[email protected]> +Wenchao Xia <[email protected]> +Wenshuang Ma <[email protected]> +Xiaoqiang Zhao <[email protected]> +Xinhua Cao <[email protected]> +Xiong Zhang <[email protected]> +Yin Yin <[email protected]> +yuchenlin <[email protected]> +YunQiang Su <[email protected]> +YunQiang Su <[email protected]> +Yuri Pudgorodskiy <[email protected]> +Zhengui Li <[email protected]> +Zhenwei Pi <[email protected]> +Zhenwei Pi <[email protected]> +Zhuang Yanying <[email protected]> --2.20.1
Re: [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics
Quoted 11 lines · Aleksandar Markovic
23.08.2019. 01.10, "Philippe Mathieu-Daudé" <[email protected] <mailto:[email protected]>> је написао/ла:
Quoted 6 lines
All of these emails have a least 1 commit with utf8/latin1 encoding issue, or one with no author name.
When there are multiple commits, keep the author name the most used.Signed-off-by Philippe Mathieu-Daudé <[email protected]<mailto:[email protected]>>
Quoted 1 line
---
Quoted 7 lines
Reviewed-by Aleksandar Markovic <[email protected]<mailto:[email protected]>>
Out of the scope of this patch, what about the cases like Mateja Marjanovic, who contributed with both [email protected] <mailto:[email protected]> and [email protected] <mailto:[email protected]> ?
GIT-SHORTLOG(1) manpage is not clear about how it handles email casing.
Anyhow, this last section only clean the author name (utf8/latin1 encoding issue), there is no change in the email.
So in Mateja case, since the author name is the same, it is fine:
Mateja Marjanovic <[email protected]>
Mateja Marjanovic <[email protected]>
Thank you for your review!
Phil.
Quoted 9 lines · Philippe Mathieu-Daudé
Trivial cleanup of .mailmap to have a nice 'git shortlog' output.
Philippe Mathieu-Daudé (3):
mailmap: Reorder by sections
mailmap: Update philmd email address
mailmap: Add many entries to improve 'git shortlog' statistics.mailmap | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 8 deletions(-)
Series
However, it increases the difference to contrib/gitdm/aliases. I'm just as guilty; my recent "[PATCH 2/2] contrib/gitdm: Add [email protected] to group-map-redhat" updates only that. and not .mailmap.
Perhaps we want to keep the two in sync manually. We should then add suitable comments to each file.
Could we instead teach gitdm to use .mailmap, and ditch contrib/gitdm/aliases?
aliases' format is documented in gitdm's README. Each line maps a non-canonical e-mail address to a canonical one.
.mailmap's format is documented in git-shortlog(1). It can do a bit more. Even the common part differs: it has two addresses in different order *boggle*.
23.08.2019. 08.13, "Markus Armbruster" <[email protected]> је написао/ла:
Quoted 10 lines
Quoted 7 lines · Philippe Mathieu-Daudé
Trivial cleanup of .mailmap to have a nice 'git shortlog' output.
Philippe Mathieu-Daudé (3):
mailmap: Reorder by sections
mailmap: Update philmd email address
mailmap: Add many entries to improve 'git shortlog' statistics
Quoted 7 lines
Quoted 2 lines
.mailmap | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 8 deletions(-)Series
Reviewed-by Markus Armbruster <[email protected]>However, it increases the difference to contrib/gitdm/aliases.
Alex' initial gitdm effort, as I understood it, was not meant to cover all history from 2007 or so, but just to give reasonable statistics for 2018 (amd future years).
In that light, .mailmap and gitdm aliases do not need to be equivalent.
But perhaps Alex would now want gitdm to be used for all QEMU history? Is this desirable?
Aleksandar
Quoted 17 lines
I'm just
as guilty; my recent "[PATCH 2/2] contrib/gitdm: Add [email protected] to group-map-redhat" updates only that. and not .mailmap.Perhaps we want to keep the two in sync manually. We should then add suitable comments to each file.
Could we instead teach gitdm to use .mailmap, and ditch contrib/gitdm/aliases?
aliases' format is documented in gitdm's README. Each line maps a non-canonical e-mail address to a canonical one.
.mailmap's format is documented in git-shortlog(1). It can do a bit more. Even the common part differs: it has two addresses in different order *boggle*.
Quoted 19 lines · Aleksandar Markovic
23.08.2019. 08.13, "Markus Armbruster" <[email protected]> је написао/ла:
Quoted 10 lines
Quoted 7 lines · Philippe Mathieu-Daudé
Trivial cleanup of .mailmap to have a nice 'git shortlog' output.
Philippe Mathieu-Daudé (3):
mailmap: Reorder by sections
mailmap: Update philmd email address
mailmap: Add many entries to improve 'git shortlog' statisticsQuoted 7 lines
Quoted 2 lines
.mailmap | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 8 deletions(-)Series
Reviewed-by Markus Armbruster <[email protected]>However, it increases the difference to contrib/gitdm/aliases.
Quoted 8 lines
Alex' initial gitdm effort, as I understood it, was not meant to cover all history from 2007 or so, but just to give reasonable statistics for 2018 (amd future years).
In that light, .mailmap and gitdm aliases do not need to be equivalent.
But perhaps Alex would now want gitdm to be used for all QEMU history? Is this desirable?
It would be of interest historically but not something I'd want to spend a lot of time adding code churn for.
Quoted 20 lines
Aleksandar
Quoted 17 lines
I'm just
as guilty; my recent "[PATCH 2/2] contrib/gitdm: Add [email protected] to group-map-redhat" updates only that. and not .mailmap.Perhaps we want to keep the two in sync manually. We should then add suitable comments to each file.
Could we instead teach gitdm to use .mailmap, and ditch contrib/gitdm/aliases?
aliases' format is documented in gitdm's README. Each line maps a non-canonical e-mail address to a canonical one.
.mailmap's format is documented in git-shortlog(1). It can do a bit more. Even the common part differs: it has two addresses in different order *boggle*.
--
Alex Bennée