From b8003f99565c9d7862938c586fecd1d9a56ee22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Fri, 11 Mar 2022 13:41:53 +0000 Subject: [PATCH] mailmap/gitdm: more fixes for bad tags and authors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 alarson@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 michael@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 Message-Id: <20220315121251.2280317-6-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Acked-by: Aaron Larson Acked-by: Michael Ellerman Cc: Andreas Färber Cc: Jason Wang --- .mailmap | 6 ++++++ contrib/gitdm/aliases | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 5113f55b3a..09dcd8c216 100644 --- a/.mailmap +++ b/.mailmap @@ -28,7 +28,11 @@ Thiemo Seufer ths malc malc # Corrupted Author fields +Aaron Larson alarson@ddci.com +Andreas Färber Andreas Färber +Jason Wang Jason Wang Marek Dolata mkdolata@us.ibm.com +Michael Ellerman michael@ozlabs.org Nick Hudson hnick@vmware.com # There is also a: @@ -70,6 +74,7 @@ Yongbok Kim # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. Aaron Lindsay +Aaron Larson Alexey Gerasimenko Alex Chen Alex Ivanov @@ -144,6 +149,7 @@ Pan Nengyuan Pavel Dovgaluk Pavel Dovgaluk Pavel Dovgaluk +Peter Chubb Peter Crosthwaite Peter Crosthwaite Peter Crosthwaite diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases index 4792413ce7..e26b00a71d 100644 --- a/contrib/gitdm/aliases +++ b/contrib/gitdm/aliases @@ -34,8 +34,10 @@ malc@c046a42c-6fe2-441c-8c8c-71466251a162 av1474@comtv.ru # canonical emails liq3ea@163.com liq3ea@gmail.com -# some broken tags +# some broken DCO tags yuval.shaia.ml.gmail.com yuval.shaia.ml@gmail.com +jasowang jasowang@redhat.com +nicta.com.au peter.chubb@nicta.com.au # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>