From bc42004d1be40d9b5bec2d3e8c600780b644ff6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= Date: Mon, 6 Jan 2025 09:39:32 +0100 Subject: [PATCH] scripts: ci: check_compliance: do not use git mailmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When looking at git author in a commit range using git log, explicitly indicate we don't want to use the mailmap file (default git client behavior is to use it), so that the "actual" author info from the commit is used to perform the compliance check, and not whatever identity the author may have mapped to in the mailmap file (ex. their "main" email address might be different from the one they used to commit). Signed-off-by: Benjamin Cabé --- scripts/ci/check_compliance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py index aa4ec915b15..397edd09d35 100755 --- a/scripts/ci/check_compliance.py +++ b/scripts/ci/check_compliance.py @@ -1322,7 +1322,7 @@ class Identity(ComplianceTest): def run(self): for shaidx in get_shas(COMMIT_RANGE): - commit = git("log", "--decorate=short", "-n 1", shaidx) + commit = git("log", "--decorate=short", "--no-use-mailmap", "-n 1", shaidx) signed = [] author = "" sha = ""