1. Patchew
  2. QEMU
  3. View series

[PATCH] mailmap: Add more entries to sanitize 'git log' output

Philippe Mathieu-Daudé posted 1 patch 6 years, 1 month ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20191218185723.7738-1-philmd@redhat.com
Test asan failed
Test checkpatch failed
Test FreeBSD failed
Test docker-mingw@fedora failed
Test docker-clang@ubuntu failed
Test docker-quick@centos7 failed
There is a newer version of this series
.mailmap | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
[PATCH] mailmap: Add more entries to sanitize 'git log' output
Posted by Philippe Mathieu-Daudé 6 years, 1 month ago 
Most of these developers have the Signed-off-by tag properly
written, but not the author/commiter name. Fix this.
Also we incorrectly wrote Arei Gonglei name, update and reorder.

git-log does not use this file by default until you specify the
--use-mailmap flag:

  $ git log --use-mailmap

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

diff --git a/.mailmap b/.mailmap
index 3816e4effe..1a859d9e65 100644
--- a/.mailmap
+++ b/.mailmap
@@ -56,6 +56,10 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
 Alexey Gerasimenko <x1917x@gmail.com>
 Alex Ivanov <void@aleksoft.net>
 Andreas Färber <afaerber@suse.de>
+Andreas Färber <andreas.faerber@web.de>
+Andreas Färber <andreas.faerber@web.de> <andreas.faerber>
+Arei Gonglei <arei.gonglei@huawei.com>
+Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>
 Bandan Das <bsd@redhat.com>
 Benjamin MARSILI <mlspirat42@gmail.com>
 Benoît Canet <benoit.canet@gmail.com>
@@ -67,27 +71,36 @@ Brad Smith <brad@comstyle.com>
 Brijesh Singh <brijesh.singh@amd.com>
 Brilly Wu <brillywu@viatech.com.cn>
 Cédric Vincent <cedric.vincent@st.com>
+Chai Wen <chaiw.fnst@cn.fujitsu.com>
+Chaojian Hu <chaojianhu@hotmail.com>
 CheneyLin <linzc@zju.edu.cn>
+Chen Fan <chen.fan.fnst@cn.fujitsu.com>
 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>
+Christoph Hellwig <hch@lst.de>
 Collin L. Walling <walling@linux.ibm.com>
 Daniel P. Berrangé <berrange@redhat.com>
+Disheng Su <edison@cloud.com>
+Dunrong Huang <riegamaths@gmail.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>
+Hiroyuki Obinata <hiroyuki.obinata@gmail.com>
 Jakub Jermář <jakub@jermar.eu>
 Jakub Jermář <jakub.jermar@kernkonzept.com>
+Jay Zhou <jianjay.zhou@huawei.com>
 Jean-Christophe Dubois <jcd@tribudubois.net>
+Jean-Christophe Dubois <jcd@tribudubois.net> <jcd@jcd-laptop.(none)>
+Jia Lina <jialina01@baidu.com>
 Jindřich Makovička <makovick@gmail.com>
 John Arbuckle <programmingkidx@gmail.com>
 Juha Riihimäki <juha.riihimaki@nokia.com>
@@ -96,9 +109,11 @@ Jun Li <junmuzi@gmail.com>
 Laurent Vivier <Laurent@lvivier.info>
 Leandro Lupori <leandro.lupori@gmail.com>
 Li Guang <lig.fnst@cn.fujitsu.com>
+Lili Huang <huanglili.huang@huawei.com>
 Liming Wang <walimisdev@gmail.com>
 linzhecheng <linzc@zju.edu.cn>
 Liran Schour <lirans@il.ibm.com>
+Li Tianqing <tianqing@unitedstack.com>
 Liu Yu <yu.liu@freescale.com>
 Liu Yu <Yu.Liu@freescale.com>
 Li Zhang <zhlcindy@gmail.com>
@@ -112,11 +127,14 @@ Marc Marí <marc.mari.barcelo@gmail.com>
 Marc Marí <markmb@redhat.com>
 Michael Avdienko <whitearchey@gmail.com>
 Michael S. Tsirkin <mst@redhat.com>
+Michael S. Tsirkin <mst@redhat.com> <mst@robin.(none)>
+Michael Tokarev <mjt@tls.msk.ru> <mjt@gandalf>
 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>
+Pan Nengyuan <pannengyuan@huawei.com>
 Paolo Bonzini <pbonzini@redhat.com>
 Pavel Dovgaluk <dovgaluk@ispras.ru>
 Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
@@ -124,15 +142,23 @@ Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
 Peter Crosthwaite <crosthwaite.peter@gmail.com>
 Peter Crosthwaite <peter.crosthwaite@petalogix.com>
 Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+Peter Maydell <peter.maydell@linaro.org> <petmay01@cam-vm-266.(none)>
 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>
+Richard Henderson <rth@twiddle.net> <rth@anchor.twiddle.home>
 Roger Pau Monné <roger.pau@citrix.com>
 Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
+Siwei Zhuang <siwei.zhuang@data61.csiro.au>
+Sochin Jiang <sochin@aliyun.com>
 Sochin Jiang <sochin.jiang@huawei.com>
+Stefan Berger <stefanb@linux.ibm.com> <Stefan Berger stefanb@linux.vnet.ibm.com>
+Stefan Weil <sw@weilnetz.de> <stefan@kiwi.(none)>
+Stefan Weil <sw@weilnetz.de> <stefan@weilnetz.de>
+Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
 Takashi Yoshii <takasi-y@ops.dti.ne.jp>
 Thomas Huth <thuth@redhat.com>
 Thomas Knych <thomaswk@google.com>
@@ -150,6 +176,7 @@ Wenshuang Ma <kevinnma@tencent.com>
 Xiaoqiang Zhao <zxq_yx_007@163.com>
 Xinhua Cao <caoxinhua@huawei.com>
 Xiong Zhang <xiong.y.zhang@intel.com>
+Ying Fang <fangying1@huawei.com>
 Yin Yin <yin.yin@cs2c.com.cn>
 yuchenlin <npes87184@gmail.com>
 YunQiang Su <syq@debian.org>
-- 
2.21.0
Re: [PATCH] mailmap: Add more entries to sanitize 'git log' output
Posted by Philippe Mathieu-Daudé 6 years ago 
ping?

On Wed, Dec 18, 2019 at 7:57 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Most of these developers have the Signed-off-by tag properly
> written, but not the author/commiter name. Fix this.
> Also we incorrectly wrote Arei Gonglei name, update and reorder.
>
> git-log does not use this file by default until you specify the
> --use-mailmap flag:
>
>   $ git log --use-mailmap
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  .mailmap | 29 ++++++++++++++++++++++++++++-
>  1 file changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/.mailmap b/.mailmap
> index 3816e4effe..1a859d9e65 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -56,6 +56,10 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
>  Alexey Gerasimenko <x1917x@gmail.com>
>  Alex Ivanov <void@aleksoft.net>
>  Andreas Färber <afaerber@suse.de>
> +Andreas Färber <andreas.faerber@web.de>
> +Andreas Färber <andreas.faerber@web.de> <andreas.faerber>
> +Arei Gonglei <arei.gonglei@huawei.com>
> +Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>
>  Bandan Das <bsd@redhat.com>
>  Benjamin MARSILI <mlspirat42@gmail.com>
>  Benoît Canet <benoit.canet@gmail.com>
> @@ -67,27 +71,36 @@ Brad Smith <brad@comstyle.com>
>  Brijesh Singh <brijesh.singh@amd.com>
>  Brilly Wu <brillywu@viatech.com.cn>
>  Cédric Vincent <cedric.vincent@st.com>
> +Chai Wen <chaiw.fnst@cn.fujitsu.com>
> +Chaojian Hu <chaojianhu@hotmail.com>
>  CheneyLin <linzc@zju.edu.cn>
> +Chen Fan <chen.fan.fnst@cn.fujitsu.com>
>  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>
> +Christoph Hellwig <hch@lst.de>
>  Collin L. Walling <walling@linux.ibm.com>
>  Daniel P. Berrangé <berrange@redhat.com>
> +Disheng Su <edison@cloud.com>
> +Dunrong Huang <riegamaths@gmail.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>
> +Hiroyuki Obinata <hiroyuki.obinata@gmail.com>
>  Jakub Jermář <jakub@jermar.eu>
>  Jakub Jermář <jakub.jermar@kernkonzept.com>
> +Jay Zhou <jianjay.zhou@huawei.com>
>  Jean-Christophe Dubois <jcd@tribudubois.net>
> +Jean-Christophe Dubois <jcd@tribudubois.net> <jcd@jcd-laptop.(none)>
> +Jia Lina <jialina01@baidu.com>
>  Jindřich Makovička <makovick@gmail.com>
>  John Arbuckle <programmingkidx@gmail.com>
>  Juha Riihimäki <juha.riihimaki@nokia.com>
> @@ -96,9 +109,11 @@ Jun Li <junmuzi@gmail.com>
>  Laurent Vivier <Laurent@lvivier.info>
>  Leandro Lupori <leandro.lupori@gmail.com>
>  Li Guang <lig.fnst@cn.fujitsu.com>
> +Lili Huang <huanglili.huang@huawei.com>
>  Liming Wang <walimisdev@gmail.com>
>  linzhecheng <linzc@zju.edu.cn>
>  Liran Schour <lirans@il.ibm.com>
> +Li Tianqing <tianqing@unitedstack.com>
>  Liu Yu <yu.liu@freescale.com>
>  Liu Yu <Yu.Liu@freescale.com>
>  Li Zhang <zhlcindy@gmail.com>
> @@ -112,11 +127,14 @@ Marc Marí <marc.mari.barcelo@gmail.com>
>  Marc Marí <markmb@redhat.com>
>  Michael Avdienko <whitearchey@gmail.com>
>  Michael S. Tsirkin <mst@redhat.com>
> +Michael S. Tsirkin <mst@redhat.com> <mst@robin.(none)>
> +Michael Tokarev <mjt@tls.msk.ru> <mjt@gandalf>
>  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>
> +Pan Nengyuan <pannengyuan@huawei.com>
>  Paolo Bonzini <pbonzini@redhat.com>
>  Pavel Dovgaluk <dovgaluk@ispras.ru>
>  Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
> @@ -124,15 +142,23 @@ Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
>  Peter Crosthwaite <crosthwaite.peter@gmail.com>
>  Peter Crosthwaite <peter.crosthwaite@petalogix.com>
>  Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> +Peter Maydell <peter.maydell@linaro.org> <petmay01@cam-vm-266.(none)>
>  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>
> +Richard Henderson <rth@twiddle.net> <rth@anchor.twiddle.home>
>  Roger Pau Monné <roger.pau@citrix.com>
>  Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
>  Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
> +Siwei Zhuang <siwei.zhuang@data61.csiro.au>
> +Sochin Jiang <sochin@aliyun.com>
>  Sochin Jiang <sochin.jiang@huawei.com>
> +Stefan Berger <stefanb@linux.ibm.com> <Stefan Berger stefanb@linux.vnet.ibm.com>
> +Stefan Weil <sw@weilnetz.de> <stefan@kiwi.(none)>
> +Stefan Weil <sw@weilnetz.de> <stefan@weilnetz.de>
> +Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
>  Takashi Yoshii <takasi-y@ops.dti.ne.jp>
>  Thomas Huth <thuth@redhat.com>
>  Thomas Knych <thomaswk@google.com>
> @@ -150,6 +176,7 @@ Wenshuang Ma <kevinnma@tencent.com>
>  Xiaoqiang Zhao <zxq_yx_007@163.com>
>  Xinhua Cao <caoxinhua@huawei.com>
>  Xiong Zhang <xiong.y.zhang@intel.com>
> +Ying Fang <fangying1@huawei.com>
>  Yin Yin <yin.yin@cs2c.com.cn>
>  yuchenlin <npes87184@gmail.com>
>  YunQiang Su <syq@debian.org>
> --
> 2.21.0
>
Re: [PATCH] mailmap: Add more entries to sanitize 'git log' output
Posted by Markus Armbruster 6 years ago 
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Most of these developers have the Signed-off-by tag properly
> written, but not the author/commiter name. Fix this.
> Also we incorrectly wrote Arei Gonglei name, update and reorder.
>
> git-log does not use this file by default until you specify the
> --use-mailmap flag:
>
>   $ git log --use-mailmap
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  .mailmap | 29 ++++++++++++++++++++++++++++-
>  1 file changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/.mailmap b/.mailmap
> index 3816e4effe..1a859d9e65 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -56,6 +56,10 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
>  Alexey Gerasimenko <x1917x@gmail.com>
>  Alex Ivanov <void@aleksoft.net>
>  Andreas Färber <afaerber@suse.de>
> +Andreas Färber <andreas.faerber@web.de>
> +Andreas Färber <andreas.faerber@web.de> <andreas.faerber>
> +Arei Gonglei <arei.gonglei@huawei.com>
> +Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>

I can't find this one in git-log.

>  Bandan Das <bsd@redhat.com>
>  Benjamin MARSILI <mlspirat42@gmail.com>
>  Benoît Canet <benoit.canet@gmail.com>
> @@ -67,27 +71,36 @@ Brad Smith <brad@comstyle.com>
>  Brijesh Singh <brijesh.singh@amd.com>
>  Brilly Wu <brillywu@viatech.com.cn>
>  Cédric Vincent <cedric.vincent@st.com>
> +Chai Wen <chaiw.fnst@cn.fujitsu.com>
> +Chaojian Hu <chaojianhu@hotmail.com>
>  CheneyLin <linzc@zju.edu.cn>
> +Chen Fan <chen.fan.fnst@cn.fujitsu.com>
>  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>
> +Christoph Hellwig <hch@lst.de>
>  Collin L. Walling <walling@linux.ibm.com>
>  Daniel P. Berrangé <berrange@redhat.com>
> +Disheng Su <edison@cloud.com>
> +Dunrong Huang <riegamaths@gmail.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>
> +Hiroyuki Obinata <hiroyuki.obinata@gmail.com>
>  Jakub Jermář <jakub@jermar.eu>
>  Jakub Jermář <jakub.jermar@kernkonzept.com>
> +Jay Zhou <jianjay.zhou@huawei.com>
>  Jean-Christophe Dubois <jcd@tribudubois.net>
> +Jean-Christophe Dubois <jcd@tribudubois.net> <jcd@jcd-laptop.(none)>
> +Jia Lina <jialina01@baidu.com>
>  Jindřich Makovička <makovick@gmail.com>
>  John Arbuckle <programmingkidx@gmail.com>
>  Juha Riihimäki <juha.riihimaki@nokia.com>
> @@ -96,9 +109,11 @@ Jun Li <junmuzi@gmail.com>
>  Laurent Vivier <Laurent@lvivier.info>
>  Leandro Lupori <leandro.lupori@gmail.com>
>  Li Guang <lig.fnst@cn.fujitsu.com>
> +Lili Huang <huanglili.huang@huawei.com>

I can't find this one in git-log.

>  Liming Wang <walimisdev@gmail.com>
>  linzhecheng <linzc@zju.edu.cn>
>  Liran Schour <lirans@il.ibm.com>
> +Li Tianqing <tianqing@unitedstack.com>
>  Liu Yu <yu.liu@freescale.com>
>  Liu Yu <Yu.Liu@freescale.com>
>  Li Zhang <zhlcindy@gmail.com>
> @@ -112,11 +127,14 @@ Marc Marí <marc.mari.barcelo@gmail.com>
>  Marc Marí <markmb@redhat.com>
>  Michael Avdienko <whitearchey@gmail.com>
>  Michael S. Tsirkin <mst@redhat.com>
> +Michael S. Tsirkin <mst@redhat.com> <mst@robin.(none)>
> +Michael Tokarev <mjt@tls.msk.ru> <mjt@gandalf>

I can't find these two in git-log.

>  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>
> +Pan Nengyuan <pannengyuan@huawei.com>
>  Paolo Bonzini <pbonzini@redhat.com>
>  Pavel Dovgaluk <dovgaluk@ispras.ru>
>  Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
> @@ -124,15 +142,23 @@ Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
>  Peter Crosthwaite <crosthwaite.peter@gmail.com>
>  Peter Crosthwaite <peter.crosthwaite@petalogix.com>
>  Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> +Peter Maydell <peter.maydell@linaro.org> <petmay01@cam-vm-266.(none)>

I can't find this one in git-log.

>  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>
> +Richard Henderson <rth@twiddle.net> <rth@anchor.twiddle.home>
>  Roger Pau Monné <roger.pau@citrix.com>
>  Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
>  Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
> +Siwei Zhuang <siwei.zhuang@data61.csiro.au>

It's actually spelled Siwei.Zhuang@data61.csiro.au in git-log.
Shouldn't matter.

> +Sochin Jiang <sochin@aliyun.com>
>  Sochin Jiang <sochin.jiang@huawei.com>
> +Stefan Berger <stefanb@linux.ibm.com> <Stefan Berger stefanb@linux.vnet.ibm.com>
> +Stefan Weil <sw@weilnetz.de> <stefan@kiwi.(none)>
> +Stefan Weil <sw@weilnetz.de> <stefan@weilnetz.de>
> +Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
>  Takashi Yoshii <takasi-y@ops.dti.ne.jp>
>  Thomas Huth <thuth@redhat.com>
>  Thomas Knych <thomaswk@google.com>
> @@ -150,6 +176,7 @@ Wenshuang Ma <kevinnma@tencent.com>
>  Xiaoqiang Zhao <zxq_yx_007@163.com>
>  Xinhua Cao <caoxinhua@huawei.com>
>  Xiong Zhang <xiong.y.zhang@intel.com>
> +Ying Fang <fangying1@huawei.com>
>  Yin Yin <yin.yin@cs2c.com.cn>
>  yuchenlin <npes87184@gmail.com>
>  YunQiang Su <syq@debian.org>
Re: [PATCH] mailmap: Add more entries to sanitize 'git log' output
Posted by Philippe Mathieu-Daudé 6 years ago 
On 1/18/20 8:10 AM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 
>> Most of these developers have the Signed-off-by tag properly
>> written, but not the author/commiter name. Fix this.
>> Also we incorrectly wrote Arei Gonglei name, update and reorder.
>>
>> git-log does not use this file by default until you specify the
>> --use-mailmap flag:
>>
>>    $ git log --use-mailmap
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>   .mailmap | 29 ++++++++++++++++++++++++++++-
>>   1 file changed, 28 insertions(+), 1 deletion(-)
>>
>> diff --git a/.mailmap b/.mailmap
>> index 3816e4effe..1a859d9e65 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -56,6 +56,10 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
>>   Alexey Gerasimenko <x1917x@gmail.com>
>>   Alex Ivanov <void@aleksoft.net>
>>   Andreas Färber <afaerber@suse.de>
>> +Andreas Färber <andreas.faerber@web.de>
>> +Andreas Färber <andreas.faerber@web.de> <andreas.faerber>
>> +Arei Gonglei <arei.gonglei@huawei.com>
>> +Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>
> 
> I can't find this one in git-log.

I was first surprised:

$ git log -1 3b08098b40
commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7
Author:     Gonglei <arei.gonglei@huawei.com>
AuthorDate: Wed Dec 3 18:25:46 2014 +0000
Commit:     root <root@ceth6.(none)>
CommitDate: Mon Dec 22 14:39:21 2014 +0800

     bootdevice: add validate check for qemu_boot_set()

     Signed-off-by: Gonglei <arei.gonglei@huawei.com>
     Reviewed-by: Markus Armbruster <armbru@redhat.com>

After thinking for a bit I remembered I once changed my default format:

$ git config format.pretty
fuller

I suppose I should add this in the commit description.

>>   Bandan Das <bsd@redhat.com>
>>   Benjamin MARSILI <mlspirat42@gmail.com>
>>   Benoît Canet <benoit.canet@gmail.com>
>> @@ -67,27 +71,36 @@ Brad Smith <brad@comstyle.com>
>>   Brijesh Singh <brijesh.singh@amd.com>
>>   Brilly Wu <brillywu@viatech.com.cn>
>>   Cédric Vincent <cedric.vincent@st.com>
>> +Chai Wen <chaiw.fnst@cn.fujitsu.com>
>> +Chaojian Hu <chaojianhu@hotmail.com>
>>   CheneyLin <linzc@zju.edu.cn>
>> +Chen Fan <chen.fan.fnst@cn.fujitsu.com>
>>   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>
>> +Christoph Hellwig <hch@lst.de>
>>   Collin L. Walling <walling@linux.ibm.com>
>>   Daniel P. Berrangé <berrange@redhat.com>
>> +Disheng Su <edison@cloud.com>
>> +Dunrong Huang <riegamaths@gmail.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>
>> +Hiroyuki Obinata <hiroyuki.obinata@gmail.com>
>>   Jakub Jermář <jakub@jermar.eu>
>>   Jakub Jermář <jakub.jermar@kernkonzept.com>
>> +Jay Zhou <jianjay.zhou@huawei.com>
>>   Jean-Christophe Dubois <jcd@tribudubois.net>
>> +Jean-Christophe Dubois <jcd@tribudubois.net> <jcd@jcd-laptop.(none)>
>> +Jia Lina <jialina01@baidu.com>
>>   Jindřich Makovička <makovick@gmail.com>
>>   John Arbuckle <programmingkidx@gmail.com>
>>   Juha Riihimäki <juha.riihimaki@nokia.com>
>> @@ -96,9 +109,11 @@ Jun Li <junmuzi@gmail.com>
>>   Laurent Vivier <Laurent@lvivier.info>
>>   Leandro Lupori <leandro.lupori@gmail.com>
>>   Li Guang <lig.fnst@cn.fujitsu.com>
>> +Lili Huang <huanglili.huang@huawei.com>
> 
> I can't find this one in git-log.

$ git log -1 76349f5ba8
commit 76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a
Author:     Gonglei <arei.gonglei@huawei.com>
AuthorDate: Thu Jan 29 13:13:47 2015 +0000
Commit:     Lili <huanglili.huang@huawei.com>
CommitDate: Tue Mar 3 13:13:21 2015 +0800

     bootdevice: add check in restore_boot_order()

     qemu_boot_set() can't fail in restore_boot_order(),
     then simply assert it doesn't fail, by passing
     &error_abort if boot_set_handler set.

     Suggested-by: Markus Armbruster <armbru@redhat.com>
     Signed-off-by: Gonglei <arei.gonglei@huawei.com>
     Reviewed-by: Markus Armbruster <armbru@redhat.com>

>>   Liming Wang <walimisdev@gmail.com>
>>   linzhecheng <linzc@zju.edu.cn>
>>   Liran Schour <lirans@il.ibm.com>
>> +Li Tianqing <tianqing@unitedstack.com>
>>   Liu Yu <yu.liu@freescale.com>
>>   Liu Yu <Yu.Liu@freescale.com>
>>   Li Zhang <zhlcindy@gmail.com>
>> @@ -112,11 +127,14 @@ Marc Marí <marc.mari.barcelo@gmail.com>
>>   Marc Marí <markmb@redhat.com>
>>   Michael Avdienko <whitearchey@gmail.com>
>>   Michael S. Tsirkin <mst@redhat.com>
>> +Michael S. Tsirkin <mst@redhat.com> <mst@robin.(none)>
>> +Michael Tokarev <mjt@tls.msk.ru> <mjt@gandalf>
> 
> I can't find these two in git-log.

$ git log -1 eb83c2030a
commit eb83c2030aa037b4c6037bfa3cbe181343dc6a8b
Author:     Changlong Xie <xiecl.fnst@cn.fujitsu.com>
AuthorDate: Mon Jul 25 11:48:00 2016 +0800
Commit:     Michael Tokarev <mjt@gandalf>
CommitDate: Tue Sep 13 18:12:34 2016 +0300

$ git log -1 572992eefa
commit 572992eefa74bfb92c24a28bd268de91a9311b0f
Author:     Alex Williamson <alex.williamson@redhat.com>
AuthorDate: Thu Jun 14 12:16:57 2012 -0600
Commit:     Michael S. Tsirkin <mst@robin.(none)>
CommitDate: Mon Jun 18 10:21:12 2012 +0300

>>   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>
>> +Pan Nengyuan <pannengyuan@huawei.com>
>>   Paolo Bonzini <pbonzini@redhat.com>
>>   Pavel Dovgaluk <dovgaluk@ispras.ru>
>>   Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
>> @@ -124,15 +142,23 @@ Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
>>   Peter Crosthwaite <crosthwaite.peter@gmail.com>
>>   Peter Crosthwaite <peter.crosthwaite@petalogix.com>
>>   Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>> +Peter Maydell <peter.maydell@linaro.org> <petmay01@cam-vm-266.(none)>
> 
> I can't find this one in git-log.

$ git log -1 0d4abda8f7
commit 0d4abda8f7328c8911c1d020bb6961650eaf7801
Author:     Peter Maydell <peter.maydell@linaro.org>
AuthorDate: Fri Jul 20 13:34:49 2012 +0100
Commit:     Peter Maydell <petmay01@cam-vm-266.(none)>
CommitDate: Fri Jul 20 13:34:49 2012 +0100

     hw/pl011.c: Avoid crash on read when no chr backend present

>>   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>
>> +Richard Henderson <rth@twiddle.net> <rth@anchor.twiddle.home>
>>   Roger Pau Monné <roger.pau@citrix.com>
>>   Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
>>   Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
>> +Siwei Zhuang <siwei.zhuang@data61.csiro.au>
> 
> It's actually spelled Siwei.Zhuang@data61.csiro.au in git-log.
> Shouldn't matter.

Correct:

$ git shortlog -e 6478dd745d~..6478dd745d
Zhuang, Siwei (Data61, Kensington NSW) <Siwei.Zhuang@data61.csiro.au> (1):
       hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()

$ git shortlog -e 6478dd745d~..6478dd745d
Siwei Zhuang <Siwei.Zhuang@data61.csiro.au> (1):
       hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()

Thanks for caring checking all entries!

>> +Sochin Jiang <sochin@aliyun.com>
>>   Sochin Jiang <sochin.jiang@huawei.com>
>> +Stefan Berger <stefanb@linux.ibm.com> <Stefan Berger stefanb@linux.vnet.ibm.com>
>> +Stefan Weil <sw@weilnetz.de> <stefan@kiwi.(none)>
>> +Stefan Weil <sw@weilnetz.de> <stefan@weilnetz.de>
>> +Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
>>   Takashi Yoshii <takasi-y@ops.dti.ne.jp>
>>   Thomas Huth <thuth@redhat.com>
>>   Thomas Knych <thomaswk@google.com>
>> @@ -150,6 +176,7 @@ Wenshuang Ma <kevinnma@tencent.com>
>>   Xiaoqiang Zhao <zxq_yx_007@163.com>
>>   Xinhua Cao <caoxinhua@huawei.com>
>>   Xiong Zhang <xiong.y.zhang@intel.com>
>> +Ying Fang <fangying1@huawei.com>
>>   Yin Yin <yin.yin@cs2c.com.cn>
>>   yuchenlin <npes87184@gmail.com>
>>   YunQiang Su <syq@debian.org>
>
Re: [PATCH] mailmap: Add more entries to sanitize 'git log' output
Posted by Markus Armbruster 6 years ago 
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 1/18/20 8:10 AM, Markus Armbruster wrote:
>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>
>>> Most of these developers have the Signed-off-by tag properly
>>> written, but not the author/commiter name. Fix this.
>>> Also we incorrectly wrote Arei Gonglei name, update and reorder.
>>>
>>> git-log does not use this file by default until you specify the
>>> --use-mailmap flag:
>>>
>>>    $ git log --use-mailmap
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> ---
>>>   .mailmap | 29 ++++++++++++++++++++++++++++-
>>>   1 file changed, 28 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/.mailmap b/.mailmap
>>> index 3816e4effe..1a859d9e65 100644
>>> --- a/.mailmap
>>> +++ b/.mailmap
>>> @@ -56,6 +56,10 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
>>>   Alexey Gerasimenko <x1917x@gmail.com>
>>>   Alex Ivanov <void@aleksoft.net>
>>>   Andreas Färber <afaerber@suse.de>
>>> +Andreas Färber <andreas.faerber@web.de>
>>> +Andreas Färber <andreas.faerber@web.de> <andreas.faerber>
>>> +Arei Gonglei <arei.gonglei@huawei.com>
>>> +Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>
>>
>> I can't find this one in git-log.
>
> I was first surprised:
>
> $ git log -1 3b08098b40
> commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7
> Author:     Gonglei <arei.gonglei@huawei.com>
> AuthorDate: Wed Dec 3 18:25:46 2014 +0000
> Commit:     root <root@ceth6.(none)>
> CommitDate: Mon Dec 22 14:39:21 2014 +0800
>
>     bootdevice: add validate check for qemu_boot_set()
>
>     Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>     Reviewed-by: Markus Armbruster <armbru@redhat.com>
>
> After thinking for a bit I remembered I once changed my default format:
>
> $ git config format.pretty
> fuller

Aha!  Could've thought of this myself...

> I suppose I should add this in the commit description.

Can't hurt.

[...]
>>>   Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
>>>   Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
>>> +Siwei Zhuang <siwei.zhuang@data61.csiro.au>
>>
>> It's actually spelled Siwei.Zhuang@data61.csiro.au in git-log.
>> Shouldn't matter.
>
> Correct:
>
> $ git shortlog -e 6478dd745d~..6478dd745d
> Zhuang, Siwei (Data61, Kensington NSW) <Siwei.Zhuang@data61.csiro.au> (1):
>       hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()
>
> $ git shortlog -e 6478dd745d~..6478dd745d
> Siwei Zhuang <Siwei.Zhuang@data61.csiro.au> (1):
>       hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()

Suggest to adjust case if you respin.

> Thanks for caring checking all entries!

Reviewed-by: Markus Armbruster <armbru@redhat.com>

[...]
Re: [PATCH] mailmap: Add more entries to sanitize 'git log' output
Posted by Philippe Mathieu-Daudé 6 years ago 
On 1/18/20 2:27 PM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 
>> On 1/18/20 8:10 AM, Markus Armbruster wrote:
>>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>>
>>>> Most of these developers have the Signed-off-by tag properly
>>>> written, but not the author/commiter name. Fix this.
>>>> Also we incorrectly wrote Arei Gonglei name, update and reorder.
>>>>
>>>> git-log does not use this file by default until you specify the
>>>> --use-mailmap flag:
>>>>
>>>>     $ git log --use-mailmap
>>>>
>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> ---
>>>>    .mailmap | 29 ++++++++++++++++++++++++++++-
>>>>    1 file changed, 28 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/.mailmap b/.mailmap
>>>> index 3816e4effe..1a859d9e65 100644
>>>> --- a/.mailmap
>>>> +++ b/.mailmap
>>>> @@ -56,6 +56,10 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
>>>>    Alexey Gerasimenko <x1917x@gmail.com>
>>>>    Alex Ivanov <void@aleksoft.net>
>>>>    Andreas Färber <afaerber@suse.de>
>>>> +Andreas Färber <andreas.faerber@web.de>
>>>> +Andreas Färber <andreas.faerber@web.de> <andreas.faerber>
>>>> +Arei Gonglei <arei.gonglei@huawei.com>
>>>> +Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>
>>>
>>> I can't find this one in git-log.
>>
>> I was first surprised:
>>
>> $ git log -1 3b08098b40
>> commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7
>> Author:     Gonglei <arei.gonglei@huawei.com>
>> AuthorDate: Wed Dec 3 18:25:46 2014 +0000
>> Commit:     root <root@ceth6.(none)>
>> CommitDate: Mon Dec 22 14:39:21 2014 +0800
>>
>>      bootdevice: add validate check for qemu_boot_set()
>>
>>      Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>>      Reviewed-by: Markus Armbruster <armbru@redhat.com>
>>
>> After thinking for a bit I remembered I once changed my default format:
>>
>> $ git config format.pretty
>> fuller
> 
> Aha!  Could've thought of this myself...
> 
>> I suppose I should add this in the commit description.
> 
> Can't hurt.

OK will do, thank for the review!

> [...]
>>>>    Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
>>>>    Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
>>>> +Siwei Zhuang <siwei.zhuang@data61.csiro.au>
>>>
>>> It's actually spelled Siwei.Zhuang@data61.csiro.au in git-log.
>>> Shouldn't matter.
>>
>> Correct:
>>
>> $ git shortlog -e 6478dd745d~..6478dd745d
>> Zhuang, Siwei (Data61, Kensington NSW) <Siwei.Zhuang@data61.csiro.au> (1):
>>        hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()
>>
>> $ git shortlog -e 6478dd745d~..6478dd745d
>> Siwei Zhuang <Siwei.Zhuang@data61.csiro.au> (1):
>>        hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()
> 
> Suggest to adjust case if you respin.
> 
>> Thanks for caring checking all entries!
> 
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> 
> [...]
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.