Re: [PATCH v4 00/32] .mailmap: Add mailmap file to have a cleaner git history

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

Hi Laszlo,

On 1/6/20 7:13 PM, Laszlo Ersek wrote:
> On 01/06/20 12:53, Philippe Mathieu-Daude wrote:
>> The .mailmap git feature helps fixing commit mistakes (in name/email).
>>
>> The easiest way to use it is with the --use-mailmap flag:
>>
>>    $ git log --use-mailmap
>>
>> See documentation [1] and [2], and interesting blog [3].
>>
>> Laszlo replied [4] to v1 explaining stewards want to avoid avoid
>> cross-domain mapping, and suggested to split in per email-address
>> patches, so contributors can individually Ack/Nack.
>>
>> This v4 collects the patches of the 30 developers who replied to
>> the v2 [5] and v3 [6] with their R-b tag.
>>
>> I dropped the unreviewed patches and am cc'ing this series to the
>> Tianocore stewards, as suggested by Laszlo in [7].
>>
>> This series is sent with 8-bit encoding, but is also available at:
>> https://gitlab.com/philmd/edk2/commits/mailmap-v4
>>
>> Regards,
>>
>> Phil.
>>
>> [1] https://git-scm.com/docs/git-shortlog#_mapping_authors
>> [2] https://git-scm.com/docs/git-check-mailmap#_mapping_authors
>> [3] https://github.com/sympy/sympy/wiki/Using-.mailmap#making-mailmap-entries
>> [4] https://edk2.groups.io/g/devel/message/51657
>> [5] https://edk2.groups.io/g/devel/message/51834
>> [6] https://edk2.groups.io/g/devel/message/52667
>> [7] https://edk2.groups.io/g/devel/message/51906
> 
> Pushed as commit range 6cfb6da9518d..0ef6fbbd114e, via <https://github.com/tianocore/edk2/pull/272>.
> 
> I had to implement 5 modifications in the commit messages, in total:

I'm sorry I gave you extra work :(

> - In one case, "PatchCheck.py" correctly warned about a malformed Reviewed-by tag. I had to insert a space character between the name and the email address.

I did run PatchCheck.py at some point on previous version of this 
series, but I rebased/cherry-picked so many times, I might have used the 
branch previous to PatchCheck.py fixes...

> 
> - In four cases, "PatchCheck.py" incorrectly broke on subject lines that were not plain ASCII, but contained unicode code points encoded as valid UTF-8. I had to transliterate those subject lines manually, to suppress the "PatchCheck.py" errors.
> 
> Please see the git-range-diff output below that summarizes the changes relative to your "mailmap-v4" branch.

Perfect!

> 
> ---*---
>   1:  eaeae84de557 !  1:  4a1aeca3bd02 .mailmap: Add a stub with documentation
>      @@ -14,6 +14,7 @@
>       
>           Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-2-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       new file mode 100644
>   2:  d51c7b4139f7 !  2:  ba5410320bab .mailmap: Add an entry for Aaron Li
>      @@ -12,6 +12,7 @@
>           Cc: Songpeng Li <songpeng.li@intel.com>
>           Reviewed-by: Aaron Li <aaron.li@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-3-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   3:  b9e6c89e78fa !  3:  0ce7f25fe3aa .mailmap: Add an entry for Antoine Cœur
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Antoine Cœur
>      +    .mailmap: Add an entry for Antoine Coeur
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -9,8 +9,11 @@
>           address displayed properly in the git history.
>       
>           Cc: Antoine Cœur <coeur@gmx.fr>
>      -    Reviewed-by: Antoine Cœur<coeur@gmx.fr>
>      +    Reviewed-by: Antoine Cœur <coeur@gmx.fr>

I'm surprised 'œ' is accepted.

>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-4-philmd@redhat.com>
>      +    [lersek@redhat.com: fix up valid PatchCheck.py error in Reviewed-by]
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   4:  0b1e7ea11688 !  4:  83e78feb8092 .mailmap: Add an entry for Ard Biesheuvel
>      @@ -11,6 +11,7 @@
>           Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>           Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-5-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   5:  7462b7cbc23c !  5:  caa6584f36bc .mailmap: Add an entry for Ashley DeSimone
>      @@ -11,6 +11,7 @@
>           Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
>           Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-6-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   6:  069957aaaacc !  6:  d42046e1da94 .mailmap: Add an entry for Baraneedharan Anbazhagan
>      @@ -11,6 +11,7 @@
>           Cc: Baraneedharan Anbazhagan <anbazhagan@hp.com>
>           Reviewed-by: Baraneedharan Anbazhagan <anbazhagan@hp.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-7-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   7:  4244e9dc3dbd !  7:  31d60b9ba442 .mailmap: Add an entry for Chasel Chiu
>      @@ -11,6 +11,7 @@
>           Cc: Chasel Chiu <chasel.chiu@intel.com>
>           Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-8-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   8:  90ca9851f61a !  8:  0d141df465c9 .mailmap: Add an entry for Christopher J Zurcher
>      @@ -11,6 +11,7 @@
>           Cc: Christopher J Zurcher <christopher.j.zurcher@intel.com>
>           Reviewed-by: Christopher J Zurcher <christopher.j.zurcher@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-9-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   9:  43bffebe22d1 !  9:  52b6a7c88940 .mailmap: Add an entry for Eric Dong
>      @@ -11,6 +11,7 @@
>           Cc: Eric Dong <eric.dong@intel.com>
>           Reviewed-by: Eric Dong <eric.dong@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-10-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 10:  20f9db0fc4b7 ! 10:  e2a8eaec0fbc .mailmap: Add an entry for Erik Bjorge
>      @@ -11,6 +11,7 @@
>           Cc: Erik Bjorge <erik.c.bjorge@intel.com>
>           Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-11-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 11:  78b0c1c13669 ! 11:  082208a8495e .mailmap: Add an entry for Hao Wu
>      @@ -11,6 +11,7 @@
>           Cc: Hao Wu <hao.a.wu@intel.com>
>           Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-12-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 12:  0056fcafdeca ! 12:  59bbab3a9a34 .mailmap: Add an entry for Hot Tian
>      @@ -11,6 +11,7 @@
>           Cc: Hot Tian <hot.tian@intel.com>
>           Reviewed-by: Hot Tian <hot.tian@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-13-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 13:  20d75fb6974e ! 13:  1bbbd6a79d29 .mailmap: Add an entry for Jiewen Yao
>      @@ -11,6 +11,7 @@
>           Cc: Jiewen Yao <jiewen.yao@intel.com>
>           Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-14-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 14:  361d0b00d16e ! 14:  5556529b9493 .mailmap: Add an entry for Jim Dailey
>      @@ -11,6 +11,7 @@
>           Cc: Jim Dailey <Jim.Dailey@Dell.com>
>           Reviewed-by: Jim Dailey <Jim.Dailey@Dell.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-15-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 15:  efe98a6386f6 ! 15:  f235838f58b9 .mailmap: Add an entry for Laszlo Ersek
>      @@ -11,6 +11,7 @@
>           Cc: Laszlo Ersek <lersek@redhat.com>
>           Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-16-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 16:  f8c989462c4a ! 16:  44c9a93948de .mailmap: Add an entry for Liming Gao
>      @@ -11,6 +11,7 @@
>           Cc: Liming Gao <liming.gao@intel.com>
>           Reviewed-by: Liming Gao <liming.gao@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-17-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 17:  454d9fe1b13b ! 17:  a85cdb9f2b4d .mailmap: Add an entry for Maciej Rabeda
>      @@ -11,6 +11,7 @@
>           Cc: Maciej Rabeda <maciej.rabeda@intel.com>
>           Reviewed-by: Maciej Rabeda <maciej.rabeda@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-18-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 18:  99899c71a7f4 ! 18:  9b2e99e50a72 .mailmap: Add an entry for Marc-André Lureau
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Marc-André Lureau
>      +    .mailmap: Add an entry for Marc-Andre Lureau
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -11,6 +11,8 @@
>           Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
>           Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-19-philmd@redhat.com>
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 19:  ef0db1c9c6c4 ! 19:  76fc03874674 .mailmap: Add an entry for Marvin Häuser
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Marvin Häuser
>      +    .mailmap: Add an entry for Marvin Haeuser
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -13,6 +13,8 @@
>           Cc: Marvin Häuser <Marvin.Haeuser@outlook.com>
>           Reviewed-by: Marvin Häuser <mhaeuser@outlook.de>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-20-philmd@redhat.com>
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 20:  073e907d6369 ! 20:  8ef8175a330c .mailmap: Add an entry for Maurice Ma
>      @@ -11,6 +11,7 @@
>           Cc: Maurice Ma <maurice.ma@intel.com>
>           Reviewed-by: Maurice Ma <maurice.ma@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-21-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 21:  30d69fe146cc ! 21:  43f2c9f8eb94 .mailmap: Add an entry for Michael Kubacki
>      @@ -11,6 +11,7 @@
>           Cc: Michael Kubacki <michael.a.kubacki@intel.com>
>           Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-22-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 22:  2598f7175eb4 ! 22:  266efa6b296c .mailmap: Add an entry for Ming Tan
>      @@ -11,6 +11,7 @@
>           Cc: Ming Tan <ming.tan@intel.com>
>           Reviewed-by: Ming Tan <ming.tan@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-23-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 23:  535592f359d5 ! 23:  21429c1566fb .mailmap: Add an entry for Nikolai Saoukh
>      @@ -11,6 +11,7 @@
>           Cc: Nikolai Saoukh <nms@otdel-1.org>
>           Reviewed-by: Nikolai Saoukh <nms@otdel-1.org>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-24-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 24:  e3d5d0309650 ! 24:  a292d6c8ef31 .mailmap: Add an entry for Philippe Mathieu-Daudé
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Philippe Mathieu-Daudé
>      +    .mailmap: Add an entry for Philippe Mathieu-Daude
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -10,6 +10,8 @@
>       
>           Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-25-philmd@redhat.com>
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 25:  2ca124768e5a ! 25:  80f7c1b46408 .mailmap: Add an entry for Ray Ni
>      @@ -11,6 +11,7 @@
>           Cc: Ray Ni <ray.ni@intel.com>
>           Reviewed-by: Ray Ni <ray.ni@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-26-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 26:  c1cb9e02b79d ! 26:  ad12178c3dc1 .mailmap: Add an entry for Samer El-Haj-Mahmoud
>      @@ -12,6 +12,7 @@
>           Cc: Samer El-Haj-Mahmoud  <samer@elhajmahmoud.com>
>           Reviewed-by: Samer El-Haj-Mahmoud  <samer@elhajmahmoud.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-27-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 27:  c24088eb64f6 ! 27:  088573c97381 .mailmap: Add an entry for Shenglei Zhang
>      @@ -11,6 +11,7 @@
>           Cc: Shenglei Zhang <shenglei.zhang@intel.com>
>           Reviewed-by: Shenglei Zhang <shenglei.zhang@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-28-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 28:  ef26ef691e4e ! 28:  0e660ee7a179 .mailmap: Add an entry for Star Zeng
>      @@ -11,6 +11,7 @@
>           Cc: Star Zeng <star.zeng@intel.com>
>           Reviewed-by: Star Zeng <star.zeng@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-29-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 29:  cee7d719359a ! 29:  76b51586f4dc .mailmap: Add an entry for Vitaly Cheptsov
>      @@ -11,6 +11,7 @@
>           Cc: Vitaly Cheptsov <vit9696@protonmail.com>
>           Reviewed-by: Vitaly Cheptsov <vit9696@protonmail.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-30-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 30:  540df330a618 ! 30:  c751368c371a .mailmap: Add an entry for Vladimir Olovyannikov
>      @@ -11,6 +11,7 @@
>           Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
>           Reviewed-by: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-31-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 31:  083b6b1db881 ! 31:  d96c7befc08d .mailmap: Add an entry for Yonghong Zhu
>      @@ -11,6 +11,7 @@
>           Cc: Yonghong Zhu <yonghong.zhu@intel.com>
>           Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-32-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 32:  3b12182e47a5 ! 32:  0ef6fbbd114e .mailmap: Add an entry for Yu-Chen Lin
>      @@ -11,6 +11,7 @@
>           Cc: Yu-Chen Lin <yuchenlin@synology.com>
>           Reviewed-by: Yu-Chen Lin <yuchenlin@synology.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-33-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> ---*---
> 
> Thanks!
> Laszlo
>