I was running some historical tags for the last 10 years and got the
following warnings:

  git log --use-mailmap --numstat --since "June 2010" | ~/src/gitdm.git/gitdm 
-n -l 5
  alar...@ddci.com is an author name, probably not what you want
  bad utf-8 ('utf-8' codec can't decode byte 0xe4 in position 552: invalid 
continuation byte) in patchm skipping
  bad utf-8 ('utf-8' codec can't decode byte 0xe4 in position 342: invalid 
continuation byte) in patchm skipping
  mich...@ozlabs.org  is an author name, probably not what you want
  Oops...funky email nicta.com.au
  bad utf-8 ('utf-8' codec can't decode byte 0xe9 in position 232: invalid 
continuation byte) in patchm skipping
  Oops...funky email andreas.faerber
  Grabbing changesets...done
  Processed 76422 csets from 1902 developers

The following fixes try and alleviate that although I still get a
warning for Aaron which I think is from 9743cd5736.

Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
Cc: Aaron Larson <alar...@ddci.com>
Cc: Andreas Färber <andreas.faer...@web.de>
Cc: Jason Wang <jasow...@redhat.com>
Cc: Michael Ellerman <mich...@ellerman.id.au>
Cc: Peter Chubb <peter.ch...@nicta.com.au>
---
 .mailmap              | 6 ++++++
 contrib/gitdm/aliases | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 5113f55b3a..5dc168b199 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,7 +28,11 @@ Thiemo Seufer <t...@networkno.de> ths 
<ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <av1...@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
 # Corrupted Author fields
+Aaron Larson <alar...@ddci.com> alar...@ddci.com
+Andreas Färber <andreas.faer...@web.de> Andreas Färber <andreas.faerber>
+Jason Wang <jasow...@redhat.com> Jason Wang <jasowang>
 Marek Dolata <mkdol...@us.ibm.com> mkdol...@us.ibm.com <mkdol...@us.ibm.com>
+Michael Ellerman <mich...@ellerman.id.au> mich...@ozlabs.org 
<mich...@ozlabs.org>
 Nick Hudson <hn...@vmware.com> hn...@vmware.com <hn...@vmware.com>
 
 # There is also a:
@@ -70,6 +74,7 @@ Yongbok Kim <yongbok....@mips.com> <yongbok....@imgtec.com>
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
 Aaron Lindsay <aa...@os.amperecomputing.com>
+Aaron Larson <alar...@ddci.com>
 Alexey Gerasimenko <x19...@gmail.com>
 Alex Chen <alex.c...@huawei.com>
 Alex Ivanov <v...@aleksoft.net>
@@ -144,6 +149,7 @@ Pan Nengyuan <pannengy...@huawei.com>
 Pavel Dovgaluk <dovga...@ispras.ru>
 Pavel Dovgaluk <pavel.dovga...@gmail.com>
 Pavel Dovgaluk <pavel.dovga...@ispras.ru>
+Peter Chubb <peter.ch...@nicta.com.au>
 Peter Crosthwaite <crosthwaite.pe...@gmail.com>
 Peter Crosthwaite <peter.crosthwa...@petalogix.com>
 Peter Crosthwaite <peter.crosthwa...@xilinx.com>
diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases
index 4792413ce7..5b31635c15 100644
--- a/contrib/gitdm/aliases
+++ b/contrib/gitdm/aliases
@@ -34,8 +34,11 @@ malc@c046a42c-6fe2-441c-8c8c-71466251a162 av1...@comtv.ru
 # canonical emails
 liq...@163.com liq...@gmail.com
 
-# some broken tags
+# some broken DCO tags
 yuval.shaia.ml.gmail.com yuval.shaia...@gmail.com
+jasowang jasow...@redhat.com
+nicta.com.au peter.ch...@nicta.com.au
+alar...@ddci.com alar...@ddci.com
 
 # There is also a:
 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
-- 
2.30.2


Reply via email to