On 1/18/20 8:10 AM, Markus Armbruster wrote:
Philippe Mathieu-Daudé <[email protected]> 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é <[email protected]>
---
  .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 <[email protected]>
  Alexey Gerasimenko <[email protected]>
  Alex Ivanov <[email protected]>
  Andreas Färber <[email protected]>
+Andreas Färber <[email protected]>
+Andreas Färber <[email protected]> <andreas.faerber>
+Arei Gonglei <[email protected]>
+Arei Gonglei <[email protected]> <root@ceth6.(none)>

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

I was first surprised:

$ git log -1 3b08098b40
commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7
Author:     Gonglei <[email protected]>
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 <[email protected]>
    Reviewed-by: Markus Armbruster <[email protected]>

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 <[email protected]>
  Benjamin MARSILI <[email protected]>
  Benoît Canet <[email protected]>
@@ -67,27 +71,36 @@ Brad Smith <[email protected]>
  Brijesh Singh <[email protected]>
  Brilly Wu <[email protected]>
  Cédric Vincent <[email protected]>
+Chai Wen <[email protected]>
+Chaojian Hu <[email protected]>
  CheneyLin <[email protected]>
+Chen Fan <[email protected]>
  Chen Gang <[email protected]>
  Chen Gang <[email protected]>
  Chen Gang <[email protected]>
  Chen Wei-Ren <[email protected]>
  Christophe Lyon <[email protected]>
+Christoph Hellwig <[email protected]>
  Collin L. Walling <[email protected]>
  Daniel P. Berrangé <[email protected]>
+Disheng Su <[email protected]>
+Dunrong Huang <[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]>
+Hiroyuki Obinata <[email protected]>
  Jakub Jermář <[email protected]>
  Jakub Jermář <[email protected]>
+Jay Zhou <[email protected]>
  Jean-Christophe Dubois <[email protected]>
+Jean-Christophe Dubois <[email protected]> <jcd@jcd-laptop.(none)>
+Jia Lina <[email protected]>
  Jindřich Makovička <[email protected]>
  John Arbuckle <[email protected]>
  Juha Riihimäki <[email protected]>
@@ -96,9 +109,11 @@ Jun Li <[email protected]>
  Laurent Vivier <[email protected]>
  Leandro Lupori <[email protected]>
  Li Guang <[email protected]>
+Lili Huang <[email protected]>

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

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

  Liming Wang <[email protected]>
  linzhecheng <[email protected]>
  Liran Schour <[email protected]>
+Li Tianqing <[email protected]>
  Liu Yu <[email protected]>
  Liu Yu <[email protected]>
  Li Zhang <[email protected]>
@@ -112,11 +127,14 @@ Marc Marí <[email protected]>
  Marc Marí <[email protected]>
  Michael Avdienko <[email protected]>
  Michael S. Tsirkin <[email protected]>
+Michael S. Tsirkin <[email protected]> <mst@robin.(none)>
+Michael Tokarev <[email protected]> <mjt@gandalf>

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

$ git log -1 eb83c2030a
commit eb83c2030aa037b4c6037bfa3cbe181343dc6a8b
Author:     Changlong Xie <[email protected]>
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 <[email protected]>
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 <[email protected]>
  Nicholas Bellinger <[email protected]>
  Nicholas Thomas <[email protected]>
  Nikunj A Dadhania <[email protected]>
  Orit Wasserman <[email protected]>
+Pan Nengyuan <[email protected]>
  Paolo Bonzini <[email protected]>
  Pavel Dovgaluk <[email protected]>
  Pavel Dovgaluk <[email protected]>
@@ -124,15 +142,23 @@ Pavel Dovgaluk <[email protected]>
  Peter Crosthwaite <[email protected]>
  Peter Crosthwaite <[email protected]>
  Peter Crosthwaite <[email protected]>
+Peter Maydell <[email protected]> <petmay01@cam-vm-266.(none)>

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

$ git log -1 0d4abda8f7
commit 0d4abda8f7328c8911c1d020bb6961650eaf7801
Author:     Peter Maydell <[email protected]>
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 <[email protected]>
  Prasad J Pandit <[email protected]>
  Qiao Nuohan <[email protected]>
  Reimar Döffinger <[email protected]>
  Remy Noel <[email protected]>
+Richard Henderson <[email protected]> <[email protected]>
  Roger Pau Monné <[email protected]>
  Shin'ichiro Kawasaki <[email protected]>
  Shin'ichiro Kawasaki <[email protected]>
+Siwei Zhuang <[email protected]>

It's actually spelled [email protected] in git-log.
Shouldn't matter.

Correct:

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

$ git shortlog -e 6478dd745d~..6478dd745d
Siwei Zhuang <[email protected]> (1):
      hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()

Thanks for caring checking all entries!

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



Reply via email to