From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: devel@edk2.groups.io
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Bob Feng" <bob.c.feng@intel.com>,
"Liming Gao" <liming.gao@intel.com>
Subject: [PATCH 1/3] BaseTools/Scripts/PatchCheck.py: Do not use mailmap
Date: Tue, 4 Feb 2020 23:49:14 +0100 [thread overview]
Message-ID: <20200204224916.11320-2-philmd@redhat.com> (raw)
In-Reply-To: <20200204224916.11320-1-philmd@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
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 6823cc69bb9f..07881abaf64e 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -643,11 +643,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.21.1
next prev parent reply other threads:[~2020-02-04 22:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 22:49 [PATCH 0/3] BaseTools/Scripts: .mailmap improvements Philippe Mathieu-Daudé
2020-02-04 22:49 ` Philippe Mathieu-Daudé [this message]
2020-02-04 22:49 ` [PATCH 2/3] BaseTools/Scripts/PatchCheck.py: Detect emails rewritten by Groups.Io Philippe Mathieu-Daudé
2020-02-04 22:49 ` [PATCH 3/3] BaseTools/Scripts: Add log.mailmap to SetupGit.py Philippe Mathieu-Daudé
2020-02-04 23:19 ` [edk2-devel] [PATCH 0/3] BaseTools/Scripts: .mailmap improvements Laszlo Ersek
2020-02-05 13:47 ` Bob Feng
[not found] ` <15F085AE91AD138D.27054@groups.io>
2020-02-06 13:58 ` [edk2-devel] " Bob Feng
2020-02-06 23:47 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200204224916.11320-2-philmd@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox