Message ID | 20200118143202.29187-1-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2] mailmap: Add more entries to sanitize 'git log' output | expand |
ping? On 1/18/20 3:32 PM, Philippe Mathieu-Daudé wrote: > Most of these developers have the Signed-off-by tag properly > written, but not the author/committer name. Fix this. > Also we incorrectly wrote Arei Gonglei name, update and reorder. > > The committer name/email is displayed when using: > > $ git log --format=fuller > > (which can be set in git-config setting format.pretty=fuller). > > Example of commits with miswritten committer email: > 3b08098b40 76349f5ba8 eb83c2030a 572992eefa 0d4abda8f7 > > Note: git-log does not use this file by default until you specify > the --use-mailmap flag: > > $ git log --use-mailmap > > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > v2: > - Added Marek Dolata (commit 5a07192a0) > - Describe git-log --format=fuller > - Added Markus R-b > --- > .mailmap | 30 +++++++++++++++++++++++++++++- > 1 file changed, 29 insertions(+), 1 deletion(-) > > diff --git a/.mailmap b/.mailmap > index 3816e4effe..cf981a3ec0 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> > @@ -110,13 +125,17 @@ 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> > +Marek Dolata <mkdolata@us.ibm.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 +143,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 +177,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> >
diff --git a/.mailmap b/.mailmap index 3816e4effe..cf981a3ec0 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> @@ -110,13 +125,17 @@ 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> +Marek Dolata <mkdolata@us.ibm.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 +143,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 +177,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>