[Qemu-devel] [PULL 2/3] maint: Add .mailmap entries for patches claiming list authorship

[Eric Blake]

The list did not author any patches, but it does rewrite the
'From:' header of messages sent from any domain with restrictive
SPF policies that would otherwise prevent the message from reaching
all list recipients.  If a maintainer is not careful to undo the
list header rewrite, and the author did not include a manual
'From:' line in the body to fix the munged header, then 'git am'
happily attributes the patch to the list.  Add some mailmap
entries to correct the few that have escaped our attention; while
we also work on improving the tooling to catch the problem in
the future before a merge is even made.

Also improve the comments occurring in the file, including line
length improvements.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
 .mailmap | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index cf689b9ec99..778a4d4e2c7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
-# This mailmap just translates the weird addresses from the original import 
into git
-# into proper addresses so that they are counted properly in git shortlog 
output.
-#
+# This mailmap fixes up author names/addresses.
+
+# The first section translates weird addresses from the original git import
+# into proper addresses so that they are counted properly by git shortlog.
 Andrzej Zaborowski <address@hidden> balrog <address@hidden>
 Anthony Liguori <address@hidden> aliguori <address@hidden>
 Anthony Liguori <address@hidden> Anthony Liguori <address@hidden>
@@ -15,10 +16,19 @@ Paul Burton <address@hidden> <address@hidden>
 Paul Burton <address@hidden> <address@hidden>
 Thiemo Seufer <address@hidden> ths <address@hidden>
 malc <address@hidden> malc <address@hidden>
+
 # There is also a:
 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
 # for the cvs2svn initialization commit e63c3dc74bf.
-#
+
+# Next, translate a few commits where mailman rewrote the From: line due
+# to strict SPF, although we prefer to avoid adding more entries like that.
+Ed Swierk <address@hidden> Ed Swierk via Qemu-devel <address@hidden>
+Ian McKellar <address@hidden> Ian McKellar via Qemu-devel <address@hidden>
+Julia Suvorova <address@hidden> Julia Suvorova via Qemu-devel <address@hidden>
+Justin Terry (VM) <address@hidden> Justin Terry (VM) via Qemu-devel 
<address@hidden>
+
+
 # Also list preferred name forms where people have changed their
 # git author config
 Daniel P. Berrangé <address@hidden>
-- 
2.14.3