On 1/3/20 11:59 PM, Jordan Justen wrote:
On 2020-01-02 07:25:53, Philippe Mathieu-Daude wrote:
To avoid patches committed with incorrect email address,
use the EmailAddressCheck class on the committer email too.
Cc: Liming Gao <liming....@intel.com>
Cc: Jordan Justen <jordan.l.jus...@intel.com>
Signed-off-by: Philippe Mathieu-Daude <phi...@redhat.com>
---
RFC because I haven't checked --pretty="%cn <%ce>" works on Windows shell.
BaseTools/Scripts/PatchCheck.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py
index f0e661bfd6e3..3baeb3de7ba2 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -560,6 +560,8 @@ class CheckGitCommits:
else:
blank_line = True
print('Checking git commit:', commit)
+ email = self.read_committer_email_address_from_git(commit)
+ self.ok &= EmailAddressCheck(email, 'Committer').ok
patch = self.read_patch_from_git(commit)
self.ok &= CheckOnePatch(commit, patch).ok
if not commits:
@@ -578,6 +580,10 @@ class CheckGitCommits:
# Run git to get the commit patch
return self.run_git('show', '--pretty=email', '--no-textconv', 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)
I think '--pretty=%cn <%ce>' ought to work without double-quotes
because the argument is separately sent via the subprocess.Popen call.
I'm not certain it will work, but it ought to. :)
Oh, this works like charm on Linux :)
Thanks for the tip (and review)!
Phil.
+
def run_git(self, *args):
cmd = [ 'git' ]
cmd += args
--
2.21.0
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#52846): https://edk2.groups.io/g/devel/message/52846
Mute This Topic: https://groups.io/mt/69381399/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
