Skip to contentSkip to conversation

mailmap: Add more entries to sanitize 'git log' output

PATCH Superseded Philippe Mathieu-Daudé 2 participants 6 messages Dec 18, 2019 – Jan 18, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mailmap: Add more entries to sanitize 'git log' output

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
---
 .mailmap | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
.mailmap +28 -1
index 3816e4effe..1a859d9e65 100644
@@ -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)>
 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]>
 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>
 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)>
 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]>
+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]>
Signature · 1 line
2.21.0
#1 lore raw

ping?

Quoted 130 lines · Philippe Mathieu-Daudé

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
---
 .mailmap | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
.mailmap +28 -2
index 3816e4effe..1a859d9e65 100644
@@ -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)>
 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]>
 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>
 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)>
 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]>
+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]>
--

2.21.0

#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 19 lines · Philippe Mathieu-Daudé

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
---
 .mailmap | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
.mailmap +0 -0
index 3816e4effe..1a859d9e65 100644

.mailmap Aaron Lindsay <[email protected]> · line 62

Quoted 7 lines
.mailmap +4 -0
@@ -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.

Quoted 42 lines
.mailmap +10 -1
 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]>

.mailmap Jun Li <[email protected]> · line 112

Quoted 4 lines
.mailmap +1 -0
@@ -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.

.mailmap Marc Marí <[email protected]> · line 131

Quoted 13 lines
.mailmap +3 -0
 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.

Quoted 10 lines
.mailmap +1 -0
 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]>

.mailmap Pavel Dovgaluk <[email protected]> · line 145

Quoted 4 lines
.mailmap +1 -0
@@ -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.

.mailmap Pavel Dovgaluk <[email protected]> · line 155

Quoted 10 lines
.mailmap +2 -0
 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.

Quoted 17 lines
.mailmap +6 -0
+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]>
author Reviewed-by Markus Armbruster Reviewed-by Markus Armbruster
#3 lore raw
Quoted 16 lines · Markus Armbruster
Quoted 14 lines · Philippe Mathieu-Daudé

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
---
  .mailmap | 29 ++++++++++++++++++++++++++++-
  1 file changed, 28 insertions(+), 1 deletion(-)
Quoted 14 lines

.mailmap Aaron Lindsay <[email protected]> · line 62

Quoted 12 lines
.mailmap +4 -0
index 3816e4effe..1a859d9e65 100644
@@ -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()

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.

Quoted 40 lines
Quoted 40 lines
.mailmap +10 -1
  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]>
Quoted 8 lines

.mailmap Jun Li <[email protected]> · line 112

Quoted 6 lines
.mailmap +1 -0
  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.

Quoted 7 lines
Quoted 7 lines
.mailmap +1 -0
  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]>
Quoted 8 lines

.mailmap Marc Marí <[email protected]> · line 131

Quoted 6 lines
.mailmap +2 -0
@@ -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
Quoted 8 lines
Quoted 8 lines
.mailmap +1 -0
  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]>
Quoted 8 lines

.mailmap Pavel Dovgaluk <[email protected]> · line 145

Quoted 6 lines
.mailmap +1 -0
  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

Quoted 5 lines
Quoted 5 lines
.mailmap +0 -0
  Prasad J Pandit <[email protected]>
  Prasad J Pandit <[email protected]>
  Qiao Nuohan <[email protected]>
  Reimar Döffinger <[email protected]>
  Remy Noel <[email protected]>
Quoted 8 lines

.mailmap Pavel Dovgaluk <[email protected]> · line 155

Quoted 5 lines
.mailmap +2 -0
+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!

Quoted 18 lines
Quoted 17 lines
.mailmap +6 -0
+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]>
Reviewed-by
#4 lore raw
Quoted 43 lines · Philippe Mathieu-Daudé
Quoted 16 lines · Markus Armbruster
Quoted 14 lines · Philippe Mathieu-Daudé

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
---
  .mailmap | 29 ++++++++++++++++++++++++++++-
  1 file changed, 28 insertions(+), 1 deletion(-)
Quoted 14 lines

.mailmap Aaron Lindsay <[email protected]> · line 62

Quoted 12 lines
.mailmap +4 -0
index 3816e4effe..1a859d9e65 100644
@@ -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()

Quoted 7 lines

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...

Quoted 1 line

I suppose I should add this in the commit description.

Can't hurt.

[...]

Quoted 9 lines
Quoted 6 lines

.mailmap Pavel Dovgaluk <[email protected]> · line 155

Quoted 3 lines
.mailmap +1 -0
  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:

Quoted 7 lines
$ 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()

Suggest to adjust case if you respin.

Quoted 1 line

Thanks for caring checking all entries!

[...]

#5 lore raw
Quoted 50 lines · Markus Armbruster
Quoted 48 lines · Philippe Mathieu-Daudé
Quoted 16 lines · Markus Armbruster
Quoted 14 lines · Philippe Mathieu-Daudé

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
---
   .mailmap | 29 ++++++++++++++++++++++++++++-
   1 file changed, 28 insertions(+), 1 deletion(-)
Quoted 14 lines

.mailmap Aaron Lindsay <[email protected]> · line 62

Quoted 12 lines
.mailmap +4 -0
index 3816e4effe..1a859d9e65 100644
@@ -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()

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

Quoted 8 lines
Quoted 2 lines
$ git config format.pretty
fuller

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

Quoted 1 line

I suppose I should add this in the commit description.

Can't hurt.

OK will do, thank for the review!

Quoted 26 lines

[...]

Quoted 9 lines
Quoted 6 lines
Quoted 3 lines

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:

Quoted 7 lines
$ 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()

Suggest to adjust case if you respin.

Quoted 1 line

Thanks for caring checking all entries!

[...]