From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web11.179.1578334425072295409 for ; Mon, 06 Jan 2020 10:13:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fh4pvhYm; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578334424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WGwE4A79XojNnLnACIDGaZlG1Xrv8vcWcVQfpkdDGJM=; b=fh4pvhYm40ec0h6CiTnLX2oggHLiMcC/VxmC9v+rLa5WemMLnMgKL4pJBXPBlQao7A5ku9 k8qj9imY7qE52d3mRcwX7UoAejpykDUBAf9gjrZT7YEq9jAAsIOGe9pQ70nyndZRMAAoyq 1V9V4Cz52AvL4nL+TUZBv7tQtxDUygM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-51-SADyfQRtOPaGQ7Plwkgakg-1; Mon, 06 Jan 2020 13:13:36 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E345E107B270; Mon, 6 Jan 2020 18:13:34 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-24.ams2.redhat.com [10.36.117.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07F8D7DB55; Mon, 6 Jan 2020 18:13:30 +0000 (UTC) Subject: Re: [PATCH v4 00/32] .mailmap: Add mailmap file to have a cleaner git history To: Philippe Mathieu-Daude , devel@edk2.groups.io Cc: Andrew Fish , Michael D Kinney References: <20200106115415.11624-1-philmd@redhat.com> From: "Laszlo Ersek" Message-ID: <45d24c1b-b1fb-4a1b-6109-832ffd212ae1@redhat.com> Date: Mon, 6 Jan 2020 19:13:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200106115415.11624-1-philmd@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: SADyfQRtOPaGQ7Plwkgakg-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 01/06/20 12:53, Philippe Mathieu-Daude wrote: > The .mailmap git feature helps fixing commit mistakes (in name/email). >=20 > The easiest way to use it is with the --use-mailmap flag: >=20 > $ git log --use-mailmap >=20 > See documentation [1] and [2], and interesting blog [3]. >=20 > 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. >=20 > This v4 collects the patches of the 30 developers who replied to > the v2 [5] and v3 [6] with their R-b tag. >=20 > I dropped the unreviewed patches and am cc'ing this series to the > Tianocore stewards, as suggested by Laszlo in [7]. >=20 > This series is sent with 8-bit encoding, but is also available at: > https://gitlab.com/philmd/edk2/commits/mailmap-v4 >=20 > Regards, >=20 > Phil. >=20 > [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-ent= ries > [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 . I had to implement 5 modifications in the commit messages, in total: - 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 ad= dress. - In four cases, "PatchCheck.py" incorrectly broke on subject lines that we= re not plain ASCII, but contained unicode code points encoded as valid UTF-= 8. I had to transliterate those subject lines manually, to suppress the "Pa= tchCheck.py" errors. Please see the git-range-diff output below that summarizes the changes rela= tive to your "mailmap-v4" branch. ---*--- 1: eaeae84de557 ! 1: 4a1aeca3bd02 .mailmap: Add a stub with documentati= on @@ -14,6 +14,7 @@ =20 Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-2-philmd@redhat.com> =20 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 Reviewed-by: Aaron Li Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-3-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 3: b9e6c89e78fa ! 3: 0ce7f25fe3aa .mailmap: Add an entry for Antoine C= =C5=93ur @@ -1,6 +1,6 @@ Author: Philippe Mathieu-Daude =20 - .mailmap: Add an entry for Antoine C=C5=93ur + .mailmap: Add an entry for Antoine Coeur =20 We use .mailmap to display contributors email addresses in an uniform format. @@ -9,8 +9,11 @@ address displayed properly in the git history. =20 Cc: Antoine C=C5=93ur - Reviewed-by: Antoine C=C5=93ur + Reviewed-by: Antoine C=C5=93ur Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-4-philmd@redhat.com> + [lersek@redhat.com: fix up valid PatchCheck.py error in Reviewed-b= y] + [lersek@redhat.com: translit subject to ASCII to suppress PatchChe= ck.py] =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 4: 0b1e7ea11688 ! 4: 83e78feb8092 .mailmap: Add an entry for Ard Bieshe= uvel @@ -11,6 +11,7 @@ Cc: Ard Biesheuvel Reviewed-by: Ard Biesheuvel Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-5-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 5: 7462b7cbc23c ! 5: caa6584f36bc .mailmap: Add an entry for Ashley DeS= imone @@ -11,6 +11,7 @@ Cc: Ashley DeSimone Reviewed-by: Ashley DeSimone Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-6-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 6: 069957aaaacc ! 6: d42046e1da94 .mailmap: Add an entry for Baraneedha= ran Anbazhagan @@ -11,6 +11,7 @@ Cc: Baraneedharan Anbazhagan Reviewed-by: Baraneedharan Anbazhagan Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-7-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 7: 4244e9dc3dbd ! 7: 31d60b9ba442 .mailmap: Add an entry for Chasel Chi= u @@ -11,6 +11,7 @@ Cc: Chasel Chiu Reviewed-by: Chasel Chiu Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-8-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 8: 90ca9851f61a ! 8: 0d141df465c9 .mailmap: Add an entry for Christophe= r J Zurcher @@ -11,6 +11,7 @@ Cc: Christopher J Zurcher Reviewed-by: Christopher J Zurcher Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-9-philmd@redhat.com> =20 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 Reviewed-by: Eric Dong Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-10-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 10: 20f9db0fc4b7 ! 10: e2a8eaec0fbc .mailmap: Add an entry for Erik Bjorg= e @@ -11,6 +11,7 @@ Cc: Erik Bjorge Reviewed-by: Erik Bjorge Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-11-philmd@redhat.com> =20 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 Reviewed-by: Hao A Wu Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-12-philmd@redhat.com> =20 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 Reviewed-by: Hot Tian Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-13-philmd@redhat.com> =20 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 Reviewed-by: Jiewen Yao Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-14-philmd@redhat.com> =20 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 Reviewed-by: Jim Dailey Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-15-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 15: efe98a6386f6 ! 15: f235838f58b9 .mailmap: Add an entry for Laszlo Ers= ek @@ -11,6 +11,7 @@ Cc: Laszlo Ersek Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-16-philmd@redhat.com> =20 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 Reviewed-by: Liming Gao Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-17-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 17: 454d9fe1b13b ! 17: a85cdb9f2b4d .mailmap: Add an entry for Maciej Rab= eda @@ -11,6 +11,7 @@ Cc: Maciej Rabeda Reviewed-by: Maciej Rabeda Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-18-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 18: 99899c71a7f4 ! 18: 9b2e99e50a72 .mailmap: Add an entry for Marc-Andr= =C3=A9 Lureau @@ -1,6 +1,6 @@ Author: Philippe Mathieu-Daude =20 - .mailmap: Add an entry for Marc-Andr=C3=A9 Lureau + .mailmap: Add an entry for Marc-Andre Lureau =20 We use .mailmap to display contributors email addresses in an uniform format. @@ -11,6 +11,8 @@ Cc: Marc-Andr=C3=A9 Lureau Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-19-philmd@redhat.com> + [lersek@redhat.com: translit subject to ASCII to suppress PatchChe= ck.py] =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 19: ef0db1c9c6c4 ! 19: 76fc03874674 .mailmap: Add an entry for Marvin H= =C3=A4user @@ -1,6 +1,6 @@ Author: Philippe Mathieu-Daude =20 - .mailmap: Add an entry for Marvin H=C3=A4user + .mailmap: Add an entry for Marvin Haeuser =20 We use .mailmap to display contributors email addresses in an uniform format. @@ -13,6 +13,8 @@ Cc: Marvin H=C3=A4user Reviewed-by: Marvin H=C3=A4user Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-20-philmd@redhat.com> + [lersek@redhat.com: translit subject to ASCII to suppress PatchChe= ck.py] =20 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 Reviewed-by: Maurice Ma Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-21-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 21: 30d69fe146cc ! 21: 43f2c9f8eb94 .mailmap: Add an entry for Michael Ku= backi @@ -11,6 +11,7 @@ Cc: Michael Kubacki Reviewed-by: Michael Kubacki Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-22-philmd@redhat.com> =20 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 Reviewed-by: Ming Tan Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-23-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 23: 535592f359d5 ! 23: 21429c1566fb .mailmap: Add an entry for Nikolai Sa= oukh @@ -11,6 +11,7 @@ Cc: Nikolai Saoukh Reviewed-by: Nikolai Saoukh Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-24-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 24: e3d5d0309650 ! 24: a292d6c8ef31 .mailmap: Add an entry for Philippe M= athieu-Daud=C3=A9 @@ -1,6 +1,6 @@ Author: Philippe Mathieu-Daude =20 - .mailmap: Add an entry for Philippe Mathieu-Daud=C3=A9 + .mailmap: Add an entry for Philippe Mathieu-Daude =20 We use .mailmap to display contributors email addresses in an uniform format. @@ -10,6 +10,8 @@ =20 Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-25-philmd@redhat.com> + [lersek@redhat.com: translit subject to ASCII to suppress PatchChe= ck.py] =20 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 Reviewed-by: Ray Ni Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-26-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 26: c1cb9e02b79d ! 26: ad12178c3dc1 .mailmap: Add an entry for Samer El-H= aj-Mahmoud @@ -12,6 +12,7 @@ Cc: Samer El-Haj-Mahmoud Reviewed-by: Samer El-Haj-Mahmoud Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-27-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 27: c24088eb64f6 ! 27: 088573c97381 .mailmap: Add an entry for Shenglei Z= hang @@ -11,6 +11,7 @@ Cc: Shenglei Zhang Reviewed-by: Shenglei Zhang Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-28-philmd@redhat.com> =20 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 Reviewed-by: Star Zeng Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-29-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 29: cee7d719359a ! 29: 76b51586f4dc .mailmap: Add an entry for Vitaly Che= ptsov @@ -11,6 +11,7 @@ Cc: Vitaly Cheptsov Reviewed-by: Vitaly Cheptsov Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-30-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 30: 540df330a618 ! 30: c751368c371a .mailmap: Add an entry for Vladimir O= lovyannikov @@ -11,6 +11,7 @@ Cc: Vladimir Olovyannikov Reviewed-by: Vladimir Olovyannikov Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-31-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 31: 083b6b1db881 ! 31: d96c7befc08d .mailmap: Add an entry for Yonghong Z= hu @@ -11,6 +11,7 @@ Cc: Yonghong Zhu Reviewed-by: Yonghong Zhu Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-32-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap 32: 3b12182e47a5 ! 32: 0ef6fbbd114e .mailmap: Add an entry for Yu-Chen Li= n @@ -11,6 +11,7 @@ Cc: Yu-Chen Lin Reviewed-by: Yu-Chen Lin Signed-off-by: Philippe Mathieu-Daude + Message-Id: <20200106115415.11624-33-philmd@redhat.com> =20 diff --git a/.mailmap b/.mailmap --- a/.mailmap ---*--- Thanks! Laszlo