QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [Qemu-devel] [PATCH 0/3] mailmap: Clean up
@ 2019-08-22 23:09 Philippe Mathieu-Daudé
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections Philippe Mathieu-Daudé
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-08-22 23:09 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, 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(-)

-- 
2.20.1



^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections
  2019-08-22 23:09 [Qemu-devel] [PATCH 0/3] mailmap: Clean up Philippe Mathieu-Daudé
@ 2019-08-22 23:09 ` Philippe Mathieu-Daudé
  2019-08-23  9:37   ` Aleksandar Markovic
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 2/3] mailmap: Update philmd email address Philippe Mathieu-Daudé
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-08-22 23:09 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Philippe Mathieu-Daudé

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é <philmd@redhat.com>
---
 .mailmap | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.mailmap b/.mailmap
index b8e08297c9..e1fdc88d25 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,20 +4,12 @@
 # into proper addresses so that they are counted properly by git shortlog.
 Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
 Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
-Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
 Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
 Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
 Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
 Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
-James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
 Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
 Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
-Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
-Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
-Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
-Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
-Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
-Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
 Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
@@ -32,6 +24,15 @@ Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu
 Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
 Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
 
+# Next, replace old addresses by a more recent one.
+Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
+James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
+Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
+Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
+Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
+Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
+Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
+Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
 
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
-- 
2.20.1



^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Qemu-devel] [PATCH 2/3] mailmap: Update philmd email address
  2019-08-22 23:09 [Qemu-devel] [PATCH 0/3] mailmap: Clean up Philippe Mathieu-Daudé
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections Philippe Mathieu-Daudé
@ 2019-08-22 23:09 ` Philippe Mathieu-Daudé
  2019-08-23  9:38   ` Aleksandar Markovic
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics Philippe Mathieu-Daudé
  2019-08-23  6:13 ` [Qemu-devel] [PATCH 0/3] mailmap: Clean up Markus Armbruster
  3 siblings, 1 reply; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-08-22 23:09 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Daniel P . Berrangé, Philippe Mathieu-Daudé

Use the email address where I spend most of my time.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index e1fdc88d25..e68ddd26e6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
 Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
 Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
 Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
+Philippe Mathieu-Daudé <philmd@redhat.com> <f4bug@amsat.org>
 Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
 
 # Also list preferred name forms where people have changed their
-- 
2.20.1



^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics
  2019-08-22 23:09 [Qemu-devel] [PATCH 0/3] mailmap: Clean up Philippe Mathieu-Daudé
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections Philippe Mathieu-Daudé
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 2/3] mailmap: Update philmd email address Philippe Mathieu-Daudé
@ 2019-08-22 23:09 ` Philippe Mathieu-Daudé
  2019-08-23  9:44   ` Aleksandar Markovic
  2019-08-23  6:13 ` [Qemu-devel] [PATCH 0/3] mailmap: Clean up Markus Armbruster
  3 siblings, 1 reply; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-08-22 23:09 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, 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.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 .mailmap | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/.mailmap b/.mailmap
index e68ddd26e6..d0fc1d793c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,5 +37,110 @@ Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
 
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
+Aaron Lindsay <aaron@os.amperecomputing.com>
+Alexey Gerasimenko <x1917x@gmail.com>
+Alex Ivanov <void@aleksoft.net>
+Andreas Färber <afaerber@suse.de>
+Bandan Das <bsd@redhat.com>
+Benjamin MARSILI <mlspirat42@gmail.com>
+Benoît Canet <benoit.canet@gmail.com>
+Benoît Canet <benoit.canet@irqsave.net>
+Benoît Canet <benoit.canet@nodalink.com>
+Boqun Feng <boqun.feng@gmail.com>
+Boqun Feng <boqun.feng@intel.com>
+Brad Smith <brad@comstyle.com>
+Brijesh Singh <brijesh.singh@amd.com>
+Brilly Wu <brillywu@viatech.com.cn>
+Cédric Vincent <cedric.vincent@st.com>
+CheneyLin <linzc@zju.edu.cn>
+Chen Gang <chengang@emindsoft.com.cn>
+Chen Gang <gang.chen.5i5j@gmail.com>
+Chen Gang <gang.chen@sunrus.com.cn>
+Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
+Christophe Lyon <christophe.lyon@st.com>
+Collin L. Walling <walling@linux.ibm.com>
 Daniel P. Berrangé <berrange@redhat.com>
+Eduardo Otubo <otubo@redhat.com>
+Fabrice Desclaux <fabrice.desclaux@cea.fr>
+Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
+Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
+Gautham R. Shenoy <ego@in.ibm.com>
+Gautham R. Shenoy <ego@linux.vnet.ibm.com>
+Gonglei (Arei) <arei.gonglei@huawei.com>
+Guang Wang <wang.guang55@zte.com.cn>
+Hailiang Zhang <zhang.zhanghailiang@huawei.com>
+Hervé Poussineau <hpoussin@reactos.org>
+Jakub Jermář <jakub@jermar.eu>
+Jakub Jermář <jakub.jermar@kernkonzept.com>
+Jean-Christophe Dubois <jcd@tribudubois.net>
+Jindřich Makovička <makovick@gmail.com>
+John Arbuckle <programmingkidx@gmail.com>
+Juha Riihimäki <juha.riihimaki@nokia.com>
+Juha Riihimäki <Juha.Riihimaki@nokia.com>
+Jun Li <junmuzi@gmail.com>
+Laurent Vivier <Laurent@lvivier.info>
+Leandro Lupori <leandro.lupori@gmail.com>
+Li Guang <lig.fnst@cn.fujitsu.com>
+Liming Wang <walimisdev@gmail.com>
+linzhecheng <linzc@zju.edu.cn>
+Liran Schour <lirans@il.ibm.com>
+Liu Yu <yu.liu@freescale.com>
+Liu Yu <Yu.Liu@freescale.com>
+Li Zhang <zhlcindy@gmail.com>
+Li Zhang <zhlcindy@linux.vnet.ibm.com>
+Lluís Vilanova <vilanova@ac.upc.edu>
+Lluís Vilanova <xscript@gmx.net>
+Longpeng (Mike) <longpeng2@huawei.com>
+Luc Michel <luc.michel@git.antfield.fr>
+Luc Michel <luc.michel@greensocs.com>
+Marc Marí <marc.mari.barcelo@gmail.com>
+Marc Marí <markmb@redhat.com>
+Michael Avdienko <whitearchey@gmail.com>
+Michael S. Tsirkin <mst@redhat.com>
+Munkyu Im <munkyu.im@samsung.com>
+Nicholas Bellinger <nab@linux-iscsi.org>
+Nicholas Thomas <nick@bytemark.co.uk>
+Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
+Orit Wasserman <owasserm@redhat.com>
+Paolo Bonzini <pbonzini@redhat.com>
+Pavel Dovgaluk <dovgaluk@ispras.ru>
+Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
+Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
+Peter Crosthwaite <crosthwaite.peter@gmail.com>
+Peter Crosthwaite <peter.crosthwaite@petalogix.com>
+Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+Prasad J Pandit <pjp@fedoraproject.org>
+Prasad J Pandit <ppandit@redhat.com>
+Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+Remy Noel <remy.noel@blade-group.com>
+Roger Pau Monné <roger.pau@citrix.com>
+Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
+Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
+Sochin Jiang <sochin.jiang@huawei.com>
+Takashi Yoshii <takasi-y@ops.dti.ne.jp>
+Thomas Huth <thuth@redhat.com>
+Thomas Knych <thomaswk@google.com>
+Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
+Tony Nguyen <tony.nguyen@bt.com>
+Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
+Vibi Sreenivasan <vibi_sreenivasan@cms.com>
+Vijaya Kumar K <vijayak@cavium.com>
+Vijaya Kumar K <Vijaya.Kumar@cavium.com>
+Vijay Kumar <vijaykumar@bravegnu.org>
+Vijay Kumar <vijaykumar@zilogic.com>
+Wang Guang <wang.guang55@zte.com.cn>
+Wenchao Xia <xiawenc@linux.vnet.ibm.com>
+Wenshuang Ma <kevinnma@tencent.com>
+Xiaoqiang Zhao <zxq_yx_007@163.com>
+Xinhua Cao <caoxinhua@huawei.com>
+Xiong Zhang <xiong.y.zhang@intel.com>
+Yin Yin <yin.yin@cs2c.com.cn>
+yuchenlin <npes87184@gmail.com>
+YunQiang Su <syq@debian.org>
+YunQiang Su <ysu@wavecomp.com>
+Yuri Pudgorodskiy <yur@virtuozzo.com>
+Zhengui Li <lizhengui@huawei.com>
+Zhenwei Pi <pizhenwei@bytedance.com>
+Zhenwei Pi <zhenwei.pi@youruncloud.com>
+Zhuang Yanying <ann.zhuangyanying@huawei.com>
-- 
2.20.1



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH 0/3] mailmap: Clean up
  2019-08-22 23:09 [Qemu-devel] [PATCH 0/3] mailmap: Clean up Philippe Mathieu-Daudé
                   ` (2 preceding siblings ...)
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics Philippe Mathieu-Daudé
@ 2019-08-23  6:13 ` Markus Armbruster
  2019-08-23 23:49   ` Aleksandar Markovic
  3 siblings, 1 reply; 11+ messages in thread
From: Markus Armbruster @ 2019-08-23  6:13 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé; +Cc: qemu-trivial, qemu-devel

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> 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
Reviewed-by: Markus Armbruster <armbru@redhat.com>

However, it increases the difference to contrib/gitdm/aliases.  I'm just
as guilty; my recent "[PATCH 2/2] contrib/gitdm: Add armbru@pond.sub.org
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*.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections Philippe Mathieu-Daudé
@ 2019-08-23  9:37   ` Aleksandar Markovic
  0 siblings, 0 replies; 11+ messages in thread
From: Aleksandar Markovic @ 2019-08-23  9:37 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé; +Cc: qemu-trivial, qemu-devel

23.08.2019. 01.13, "Philippe Mathieu-Daudé" <philmd@redhat.com> је
написао/ла:
>
> 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é <philmd@redhat.com>
> ---

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:

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

>  .mailmap | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index b8e08297c9..e1fdc88d25 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -4,20 +4,12 @@
>  # into proper addresses so that they are counted properly by git
shortlog.
>  Andrzej Zaborowski <balrogg@gmail.com> balrog
<balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
>  Anthony Liguori <anthony@codemonkey.ws> aliguori
<aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
> -Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <
aliguori@us.ibm.com>
>  Aurelien Jarno <aurelien@aurel32.net> aurel32
<aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
>  Blue Swirl <blauwirbel@gmail.com> blueswir1
<blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
>  Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl
<edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
>  Fabrice Bellard <fabrice@bellard.org> bellard
<bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
> -James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
>  Jocelyn Mayer <l_indien@magic.fr> j_mayer
<j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
>  Paul Brook <paul@codesourcery.com> pbrook
<pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
> -Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
> -Aleksandar Markovic <amarkovic@wavecomp.com> <
aleksandar.markovic@mips.com>
> -Aleksandar Markovic <amarkovic@wavecomp.com> <
aleksandar.markovic@imgtec.com>
> -Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
> -Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
> -Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
>  Thiemo Seufer <ths@networkno.de> ths
<ths@c046a42c-6fe2-441c-8c8c-71466251a162>
>  malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
>
> @@ -32,6 +24,15 @@ Ian McKellar <ianloic@google.com> Ian McKellar via
Qemu-devel <qemu-devel@nongnu
>  Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <
qemu-devel@nongnu.org>
>  Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via
Qemu-devel <qemu-devel@nongnu.org>
>
> +# Next, replace old addresses by a more recent one.
> +Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <
aliguori@us.ibm.com>
> +James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
> +Aleksandar Markovic <amarkovic@wavecomp.com> <
aleksandar.markovic@mips.com>
> +Aleksandar Markovic <amarkovic@wavecomp.com> <
aleksandar.markovic@imgtec.com>
> +Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
> +Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
> +Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
> +Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
>
>  # Also list preferred name forms where people have changed their
>  # git author config, or had utf8/latin1 encoding issues.
> --
> 2.20.1
>
>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH 2/3] mailmap: Update philmd email address
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 2/3] mailmap: Update philmd email address Philippe Mathieu-Daudé
@ 2019-08-23  9:38   ` Aleksandar Markovic
  0 siblings, 0 replies; 11+ messages in thread
From: Aleksandar Markovic @ 2019-08-23  9:38 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé; +Cc: qemu-trivial, berrange, qemu-devel

23.08.2019. 01.10, "Philippe Mathieu-Daudé" <philmd@redhat.com> је
написао/ла:
>
> Use the email address where I spend most of my time.
>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/.mailmap b/.mailmap
> index e1fdc88d25..e68ddd26e6 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -32,6 +32,7 @@ Aleksandar Markovic <amarkovic@wavecomp.com> <
aleksandar.markovic@imgtec.com>
>  Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
>  Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
>  Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
> +Philippe Mathieu-Daudé <philmd@redhat.com> <f4bug@amsat.org>
>  Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
>
>  # Also list preferred name forms where people have changed their
> --
> 2.20.1
>
>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics
  2019-08-22 23:09 ` [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics Philippe Mathieu-Daudé
@ 2019-08-23  9:44   ` Aleksandar Markovic
  2019-08-23 12:37     ` Philippe Mathieu-Daudé
  0 siblings, 1 reply; 11+ messages in thread
From: Aleksandar Markovic @ 2019-08-23  9:44 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé; +Cc: qemu-trivial, qemu-devel

23.08.2019. 01.10, "Philippe Mathieu-Daudé" <philmd@redhat.com> је
написао/ла:
>
> 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é <philmd@redhat.com>
> ---

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

Out of the scope of this patch, what about the cases like Mateja
Marjanovic, who contributed with both Mateja.Marjanovic@rt-rk.com and
mateja.marjanovic@rt-rk.com ?

>  .mailmap | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 105 insertions(+)
>
> diff --git a/.mailmap b/.mailmap
> index e68ddd26e6..d0fc1d793c 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -37,5 +37,110 @@ Yongbok Kim <yongbok.kim@mips.com> <
yongbok.kim@imgtec.com>
>
>  # Also list preferred name forms where people have changed their
>  # git author config, or had utf8/latin1 encoding issues.
> +Aaron Lindsay <aaron@os.amperecomputing.com>
> +Alexey Gerasimenko <x1917x@gmail.com>
> +Alex Ivanov <void@aleksoft.net>
> +Andreas Färber <afaerber@suse.de>
> +Bandan Das <bsd@redhat.com>
> +Benjamin MARSILI <mlspirat42@gmail.com>
> +Benoît Canet <benoit.canet@gmail.com>
> +Benoît Canet <benoit.canet@irqsave.net>
> +Benoît Canet <benoit.canet@nodalink.com>
> +Boqun Feng <boqun.feng@gmail.com>
> +Boqun Feng <boqun.feng@intel.com>
> +Brad Smith <brad@comstyle.com>
> +Brijesh Singh <brijesh.singh@amd.com>
> +Brilly Wu <brillywu@viatech.com.cn>
> +Cédric Vincent <cedric.vincent@st.com>
> +CheneyLin <linzc@zju.edu.cn>
> +Chen Gang <chengang@emindsoft.com.cn>
> +Chen Gang <gang.chen.5i5j@gmail.com>
> +Chen Gang <gang.chen@sunrus.com.cn>
> +Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
> +Christophe Lyon <christophe.lyon@st.com>
> +Collin L. Walling <walling@linux.ibm.com>
>  Daniel P. Berrangé <berrange@redhat.com>
> +Eduardo Otubo <otubo@redhat.com>
> +Fabrice Desclaux <fabrice.desclaux@cea.fr>
> +Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
> +Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
> +Gautham R. Shenoy <ego@in.ibm.com>
> +Gautham R. Shenoy <ego@linux.vnet.ibm.com>
> +Gonglei (Arei) <arei.gonglei@huawei.com>
> +Guang Wang <wang.guang55@zte.com.cn>
> +Hailiang Zhang <zhang.zhanghailiang@huawei.com>
> +Hervé Poussineau <hpoussin@reactos.org>
> +Jakub Jermář <jakub@jermar.eu>
> +Jakub Jermář <jakub.jermar@kernkonzept.com>
> +Jean-Christophe Dubois <jcd@tribudubois.net>
> +Jindřich Makovička <makovick@gmail.com>
> +John Arbuckle <programmingkidx@gmail.com>
> +Juha Riihimäki <juha.riihimaki@nokia.com>
> +Juha Riihimäki <Juha.Riihimaki@nokia.com>
> +Jun Li <junmuzi@gmail.com>
> +Laurent Vivier <Laurent@lvivier.info>
> +Leandro Lupori <leandro.lupori@gmail.com>
> +Li Guang <lig.fnst@cn.fujitsu.com>
> +Liming Wang <walimisdev@gmail.com>
> +linzhecheng <linzc@zju.edu.cn>
> +Liran Schour <lirans@il.ibm.com>
> +Liu Yu <yu.liu@freescale.com>
> +Liu Yu <Yu.Liu@freescale.com>
> +Li Zhang <zhlcindy@gmail.com>
> +Li Zhang <zhlcindy@linux.vnet.ibm.com>
> +Lluís Vilanova <vilanova@ac.upc.edu>
> +Lluís Vilanova <xscript@gmx.net>
> +Longpeng (Mike) <longpeng2@huawei.com>
> +Luc Michel <luc.michel@git.antfield.fr>
> +Luc Michel <luc.michel@greensocs.com>
> +Marc Marí <marc.mari.barcelo@gmail.com>
> +Marc Marí <markmb@redhat.com>
> +Michael Avdienko <whitearchey@gmail.com>
> +Michael S. Tsirkin <mst@redhat.com>
> +Munkyu Im <munkyu.im@samsung.com>
> +Nicholas Bellinger <nab@linux-iscsi.org>
> +Nicholas Thomas <nick@bytemark.co.uk>
> +Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
> +Orit Wasserman <owasserm@redhat.com>
> +Paolo Bonzini <pbonzini@redhat.com>
> +Pavel Dovgaluk <dovgaluk@ispras.ru>
> +Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
> +Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
> +Peter Crosthwaite <crosthwaite.peter@gmail.com>
> +Peter Crosthwaite <peter.crosthwaite@petalogix.com>
> +Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> +Prasad J Pandit <pjp@fedoraproject.org>
> +Prasad J Pandit <ppandit@redhat.com>
> +Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
>  Reimar Döffinger <Reimar.Doeffinger@gmx.de>
> +Remy Noel <remy.noel@blade-group.com>
> +Roger Pau Monné <roger.pau@citrix.com>
> +Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
> +Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
> +Sochin Jiang <sochin.jiang@huawei.com>
> +Takashi Yoshii <takasi-y@ops.dti.ne.jp>
> +Thomas Huth <thuth@redhat.com>
> +Thomas Knych <thomaswk@google.com>
> +Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
> +Tony Nguyen <tony.nguyen@bt.com>
> +Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
> +Vibi Sreenivasan <vibi_sreenivasan@cms.com>
> +Vijaya Kumar K <vijayak@cavium.com>
> +Vijaya Kumar K <Vijaya.Kumar@cavium.com>
> +Vijay Kumar <vijaykumar@bravegnu.org>
> +Vijay Kumar <vijaykumar@zilogic.com>
> +Wang Guang <wang.guang55@zte.com.cn>
> +Wenchao Xia <xiawenc@linux.vnet.ibm.com>
> +Wenshuang Ma <kevinnma@tencent.com>
> +Xiaoqiang Zhao <zxq_yx_007@163.com>
> +Xinhua Cao <caoxinhua@huawei.com>
> +Xiong Zhang <xiong.y.zhang@intel.com>
> +Yin Yin <yin.yin@cs2c.com.cn>
> +yuchenlin <npes87184@gmail.com>
> +YunQiang Su <syq@debian.org>
> +YunQiang Su <ysu@wavecomp.com>
> +Yuri Pudgorodskiy <yur@virtuozzo.com>
> +Zhengui Li <lizhengui@huawei.com>
> +Zhenwei Pi <pizhenwei@bytedance.com>
> +Zhenwei Pi <zhenwei.pi@youruncloud.com>
> +Zhuang Yanying <ann.zhuangyanying@huawei.com>
> --
> 2.20.1
>
>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics
  2019-08-23  9:44   ` Aleksandar Markovic
@ 2019-08-23 12:37     ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-08-23 12:37 UTC (permalink / raw)
  To: Aleksandar Markovic; +Cc: qemu-trivial, qemu-devel

On 8/23/19 11:44 AM, Aleksandar Markovic wrote:
> 23.08.2019. 01.10, "Philippe Mathieu-Daudé" <philmd@redhat.com
> <mailto:philmd@redhat.com>> је написао/ла:
>>
>> 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é <philmd@redhat.com
> <mailto:philmd@redhat.com>>
>> ---
> 
> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com
> <mailto:amarkovic@wavecomp.com>>
> 
> Out of the scope of this patch, what about the cases like Mateja
> Marjanovic, who contributed with both Mateja.Marjanovic@rt-rk.com
> <mailto:Mateja.Marjanovic@rt-rk.com> and mateja.marjanovic@rt-rk.com
> <mailto:mateja.marjanovic@rt-rk.com> ?

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 <mateja.marjanovic@rt-rk.com>
  Mateja Marjanovic <Mateja.Marjanovic@rt-rk.com>

Thank you for your review!

Phil.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH 0/3] mailmap: Clean up
  2019-08-23  6:13 ` [Qemu-devel] [PATCH 0/3] mailmap: Clean up Markus Armbruster
@ 2019-08-23 23:49   ` Aleksandar Markovic
  2019-08-24  7:30     ` Alex Bennée
  0 siblings, 1 reply; 11+ messages in thread
From: Aleksandar Markovic @ 2019-08-23 23:49 UTC (permalink / raw)
  To: Markus Armbruster
  Cc: qemu-trivial, alex.bennee, Philippe Mathieu-Daudé, qemu-devel

23.08.2019. 08.13, "Markus Armbruster" <armbru@redhat.com> је написао/ла:
>
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>
> > 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
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>
> 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

> I'm just
> as guilty; my recent "[PATCH 2/2] contrib/gitdm: Add armbru@pond.sub.org
> 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*.
>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH 0/3] mailmap: Clean up
  2019-08-23 23:49   ` Aleksandar Markovic
@ 2019-08-24  7:30     ` Alex Bennée
  0 siblings, 0 replies; 11+ messages in thread
From: Alex Bennée @ 2019-08-24  7:30 UTC (permalink / raw)
  To: Aleksandar Markovic
  Cc: qemu-trivial, Philippe Mathieu-Daudé, Markus Armbruster, qemu-devel


Aleksandar Markovic <aleksandar.m.mail@gmail.com> writes:

> 23.08.2019. 08.13, "Markus Armbruster" <armbru@redhat.com> је написао/ла:
>>
>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>
>> > 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
>> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>>
>> 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?

It would be of interest historically but not something I'd want to spend
a lot of time adding code churn for.

>
> Aleksandar
>
>> I'm just
>> as guilty; my recent "[PATCH 2/2] contrib/gitdm: Add armbru@pond.sub.org
>> 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


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, back to index

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-22 23:09 [Qemu-devel] [PATCH 0/3] mailmap: Clean up Philippe Mathieu-Daudé
2019-08-22 23:09 ` [Qemu-devel] [PATCH 1/3] mailmap: Reorder by sections Philippe Mathieu-Daudé
2019-08-23  9:37   ` Aleksandar Markovic
2019-08-22 23:09 ` [Qemu-devel] [PATCH 2/3] mailmap: Update philmd email address Philippe Mathieu-Daudé
2019-08-23  9:38   ` Aleksandar Markovic
2019-08-22 23:09 ` [Qemu-devel] [PATCH 3/3] mailmap: Add many entries to improve 'git shortlog' statistics Philippe Mathieu-Daudé
2019-08-23  9:44   ` Aleksandar Markovic
2019-08-23 12:37     ` Philippe Mathieu-Daudé
2019-08-23  6:13 ` [Qemu-devel] [PATCH 0/3] mailmap: Clean up Markus Armbruster
2019-08-23 23:49   ` Aleksandar Markovic
2019-08-24  7:30     ` Alex Bennée

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org qemu-devel@archiver.kernel.org
	public-inbox-index qemu-devel


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox