]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools/Scripts/PatchCheck.py: Do not use mailmap
authorPhilippe Mathieu-Daude <philmd@redhat.com>
Tue, 4 Feb 2020 22:49:14 +0000 (06:49 +0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Thu, 6 Feb 2020 13:16:09 +0000 (13:16 +0000)
We check the author/committer name/email are properly displayed
since commits 8ffa47fb3ab..c0328cf3803. However if PatchCheck.py
uses the mailmap, it will check sanitized names/emails.
Use the --no-use-mailmap option so PatchCheck.py will check
unsanitized input.

Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
BaseTools/Scripts/PatchCheck.py

index 73252ef355ff18c1a7b024f4dc6aa950dec081c0..13da6967785d45e0ab5186054f14d53682000379 100755 (executable)
@@ -647,11 +647,13 @@ class CheckGitCommits:
 \r
     def read_patch_from_git(self, commit):\r
         # Run git to get the commit patch\r
-        return self.run_git('show', '--pretty=email', '--no-textconv', commit)\r
+        return self.run_git('show', '--pretty=email', '--no-textconv',\r
+                            '--no-use-mailmap', commit)\r
 \r
     def read_committer_email_address_from_git(self, commit):\r
         # Run git to get the committer email\r
-        return self.run_git('show', '--pretty=%cn <%ce>', '--no-patch', commit)\r
+        return self.run_git('show', '--pretty=%cn <%ce>', '--no-patch',\r
+                            '--no-use-mailmap', commit)\r
 \r
     def run_git(self, *args):\r
         cmd = [ 'git' ]\r