From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web09.1502.1580856571748531987 for ; Tue, 04 Feb 2020 14:49:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NBvC23ON; spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580856570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b03XUoQrlRmBYFSdM0GeTO/yyqF+kEe0NM92VonUenM=; b=NBvC23ONxtAYnxHfA7VRiZ16QZHos6ay3OW8fk8QPv9taHbS0syRL+/rFAaPYdyRfe0iqo rz8DxZpZivS7k1Yeyxm77MU6wozbElzdDyMDLW6HDitAXR2IvAdRz0lW8MaiSC6XOR9Tf4 VS7JrDMMqaNp33oEwzwMhnrQ7/Souc0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-tAXjPLj7OkWLbnLzBI7glA-1; Tue, 04 Feb 2020 17:49:28 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EDEB7A0CBF; Tue, 4 Feb 2020 22:49:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-152.brq.redhat.com [10.40.204.152]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B49B7FB79; Tue, 4 Feb 2020 22:49:25 +0000 (UTC) From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= To: devel@edk2.groups.io Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bob Feng , Liming Gao Subject: [PATCH 1/3] BaseTools/Scripts/PatchCheck.py: Do not use mailmap Date: Tue, 4 Feb 2020 23:49:14 +0100 Message-Id: <20200204224916.11320-2-philmd@redhat.com> In-Reply-To: <20200204224916.11320-1-philmd@redhat.com> References: <20200204224916.11320-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: tAXjPLj7OkWLbnLzBI7glA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Philippe Mathieu-Daud=C3=A9 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 Cc: Liming Gao Signed-off-by: Philippe Mathieu-Daude --- 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: =20 def read_patch_from_git(self, commit): # Run git to get the commit patch - return self.run_git('show', '--pretty=3Demail', '--no-textconv', c= ommit) + return self.run_git('show', '--pretty=3Demail', '--no-textconv', + '--no-use-mailmap', commit) =20 def read_committer_email_address_from_git(self, commit): # Run git to get the committer email - return self.run_git('show', '--pretty=3D%cn <%ce>', '--no-patch', = commit) + return self.run_git('show', '--pretty=3D%cn <%ce>', '--no-patch', + '--no-use-mailmap', commit) =20 def run_git(self, *args): cmd =3D [ 'git' ] --=20 2.21.1