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

[Philippe Mathieu-Daudé]

On 1/18/20 8:10 AM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <address@hidden> 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é <address@hidden>
> > ---
> >   .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 <address@hidden>
> >   Alexey Gerasimenko <address@hidden>
> >   Alex Ivanov <address@hidden>
> >   Andreas Färber <address@hidden>
> > +Andreas Färber <address@hidden>
> > +Andreas Färber <address@hidden> <andreas.faerber>
> > +Arei Gonglei <address@hidden>
> > +Arei Gonglei <address@hidden> <root@ceth6.(none)>
>
> I can't find this one in git-log.

I was first surprised:

$ git log -1 3b08098b40
commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7
Author:     Gonglei <address@hidden>
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 <address@hidden>
    Reviewed-by: Markus Armbruster <address@hidden>

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 <address@hidden>
> >   Benjamin MARSILI <address@hidden>
> >   Benoît Canet <address@hidden>
> > @@ -67,27 +71,36 @@ Brad Smith <address@hidden>
> >   Brijesh Singh <address@hidden>
> >   Brilly Wu <address@hidden>
> >   Cédric Vincent <address@hidden>
> > +Chai Wen <address@hidden>
> > +Chaojian Hu <address@hidden>
> >   CheneyLin <address@hidden>
> > +Chen Fan <address@hidden>
> >   Chen Gang <address@hidden>
> >   Chen Gang <address@hidden>
> >   Chen Gang <address@hidden>
> >   Chen Wei-Ren <address@hidden>
> >   Christophe Lyon <address@hidden>
> > +Christoph Hellwig <address@hidden>
> >   Collin L. Walling <address@hidden>
> >   Daniel P. Berrangé <address@hidden>
> > +Disheng Su <address@hidden>
> > +Dunrong Huang <address@hidden>
> >   Eduardo Otubo <address@hidden>
> >   Fabrice Desclaux <address@hidden>
> >   Fernando Luis Vázquez Cao <address@hidden>
> >   Fernando Luis Vázquez Cao <address@hidden>
> >   Gautham R. Shenoy <address@hidden>
> >   Gautham R. Shenoy <address@hidden>
> > -Gonglei (Arei) <address@hidden>
> >   Guang Wang <address@hidden>
> >   Hailiang Zhang <address@hidden>
> >   Hervé Poussineau <address@hidden>
> > +Hiroyuki Obinata <address@hidden>
> >   Jakub Jermář <address@hidden>
> >   Jakub Jermář <address@hidden>
> > +Jay Zhou <address@hidden>
> >   Jean-Christophe Dubois <address@hidden>
> > +Jean-Christophe Dubois <address@hidden> <jcd@jcd-laptop.(none)>
> > +Jia Lina <address@hidden>
> >   Jindřich Makovička <address@hidden>
> >   John Arbuckle <address@hidden>
> >   Juha Riihimäki <address@hidden>
> > @@ -96,9 +109,11 @@ Jun Li <address@hidden>
> >   Laurent Vivier <address@hidden>
> >   Leandro Lupori <address@hidden>
> >   Li Guang <address@hidden>
> > +Lili Huang <address@hidden>
>
> I can't find this one in git-log.

$ git log -1 76349f5ba8
commit 76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a
Author:     Gonglei <address@hidden>
AuthorDate: Thu Jan 29 13:13:47 2015 +0000
Commit:     Lili <address@hidden>
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 <address@hidden>
    Signed-off-by: Gonglei <address@hidden>
    Reviewed-by: Markus Armbruster <address@hidden>

> >   Liming Wang <address@hidden>
> >   linzhecheng <address@hidden>
> >   Liran Schour <address@hidden>
> > +Li Tianqing <address@hidden>
> >   Liu Yu <address@hidden>
> >   Liu Yu <address@hidden>
> >   Li Zhang <address@hidden>
> > @@ -112,11 +127,14 @@ Marc Marí <address@hidden>
> >   Marc Marí <address@hidden>
> >   Michael Avdienko <address@hidden>
> >   Michael S. Tsirkin <address@hidden>
> > +Michael S. Tsirkin <address@hidden> <mst@robin.(none)>
> > +Michael Tokarev <address@hidden> <mjt@gandalf>
>
> I can't find these two in git-log.

$ git log -1 eb83c2030a
commit eb83c2030aa037b4c6037bfa3cbe181343dc6a8b
Author:     Changlong Xie <address@hidden>
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 <address@hidden>
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 <address@hidden>
> >   Nicholas Bellinger <address@hidden>
> >   Nicholas Thomas <address@hidden>
> >   Nikunj A Dadhania <address@hidden>
> >   Orit Wasserman <address@hidden>
> > +Pan Nengyuan <address@hidden>
> >   Paolo Bonzini <address@hidden>
> >   Pavel Dovgaluk <address@hidden>
> >   Pavel Dovgaluk <address@hidden>
> > @@ -124,15 +142,23 @@ Pavel Dovgaluk <address@hidden>
> >   Peter Crosthwaite <address@hidden>
> >   Peter Crosthwaite <address@hidden>
> >   Peter Crosthwaite <address@hidden>
> > +Peter Maydell <address@hidden> <petmay01@cam-vm-266.(none)>
>
> I can't find this one in git-log.

$ git log -1 0d4abda8f7
commit 0d4abda8f7328c8911c1d020bb6961650eaf7801
Author:     Peter Maydell <address@hidden>
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 <address@hidden>
> >   Prasad J Pandit <address@hidden>
> >   Qiao Nuohan <address@hidden>
> >   Reimar Döffinger <address@hidden>
> >   Remy Noel <address@hidden>
> > +Richard Henderson <address@hidden> <address@hidden>
> >   Roger Pau Monné <address@hidden>
> >   Shin'ichiro Kawasaki <address@hidden>
> >   Shin'ichiro Kawasaki <address@hidden>
> > +Siwei Zhuang <address@hidden>
>
> It's actually spelled address@hidden in git-log.
> Shouldn't matter.

Correct:

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

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

Thanks for caring checking all entries!

> > +Sochin Jiang <address@hidden>
> >   Sochin Jiang <address@hidden>
> > +Stefan Berger <address@hidden> <Stefan Berger address@hidden>
> > +Stefan Weil <address@hidden> <stefan@kiwi.(none)>
> > +Stefan Weil <address@hidden> <address@hidden>
> > +Stefan Weil <address@hidden> <address@hidden>
> >   Takashi Yoshii <address@hidden>
> >   Thomas Huth <address@hidden>
> >   Thomas Knych <address@hidden>
> > @@ -150,6 +176,7 @@ Wenshuang Ma <address@hidden>
> >   Xiaoqiang Zhao <address@hidden>
> >   Xinhua Cao <address@hidden>
> >   Xiong Zhang <address@hidden>
> > +Ying Fang <address@hidden>
> >   Yin Yin <address@hidden>
> >   yuchenlin <address@hidden>
> >   YunQiang Su <address@hidden>