From c37cce7a843dd8a77aa449b4763fd71c08837f81 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Wed, 5 Feb 2020 06:49:14 +0800 Subject: [PATCH] BaseTools/Scripts/PatchCheck.py: Do not use mailmap 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 Cc: Bob Feng Cc: Liming Gao Reviewed-by: Laszlo Ersek Reviewed-by: Bob Feng --- BaseTools/Scripts/PatchCheck.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 73252ef355..13da696778 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -647,11 +647,13 @@ class CheckGitCommits: def read_patch_from_git(self, commit): # Run git to get the commit patch - return self.run_git('show', '--pretty=email', '--no-textconv', commit) + return self.run_git('show', '--pretty=email', '--no-textconv', + '--no-use-mailmap', commit) def read_committer_email_address_from_git(self, commit): # Run git to get the committer email - return self.run_git('show', '--pretty=%cn <%ce>', '--no-patch', commit) + return self.run_git('show', '--pretty=%cn <%ce>', '--no-patch', + '--no-use-mailmap', commit) def run_git(self, *args): cmd = [ 'git' ] -- 2.39.2