summaryrefslogtreecommitdiffstats
path: root/BaseTools/Scripts/PatchCheck.py
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daude <philmd@redhat.com>2020-02-05 06:49:14 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2020-02-06 13:16:09 +0000
commitc37cce7a843dd8a77aa449b4763fd71c08837f81 (patch)
treee0e88b1fd3c7e9ba2d840caec3e9b2695df62854 /BaseTools/Scripts/PatchCheck.py
parent38ed2ff3dd4edebbdcd1ae7da471464b663a2e21 (diff)
downloadedk2-c37cce7a843dd8a77aa449b4763fd71c08837f81.tar.gz
edk2-c37cce7a843dd8a77aa449b4763fd71c08837f81.tar.bz2
edk2-c37cce7a843dd8a77aa449b4763fd71c08837f81.zip
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 <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>
Diffstat (limited to 'BaseTools/Scripts/PatchCheck.py')
-rwxr-xr-xBaseTools/Scripts/PatchCheck.py6
1 files 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' ]