From 96603b4f02b93d7725e5d6c1701b502d6b072ab3 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Thu, 1 Aug 2019 16:03:46 -0700 Subject: [PATCH] BaseTools/PatchCheck: Disable text conversion in 'git show' https://bugzilla.tianocore.org/show_bug.cgi?id=2044 'git show' is used to extract the patch contents for analysis. Add the flag '--no-textconv' to the 'git show' command to disable the conversion from some binary file types to text content. Without this change, binary files such as .pdf files are converted to text in the show command and PatchCheck complains that the wrong line endings are used in the patch. Cc: Bob Feng Cc: Liming Gao Cc: Jordan Justen Signed-off-by: Michael D Kinney Reviewed-by: Bob Feng Reviewed-by: Liming Gao Reviewed-by: Jordan Justen Acked-by: Laszlo Ersek --- BaseTools/Scripts/PatchCheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 6b07241bfe..2a4e6f603e 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -543,7 +543,7 @@ class CheckGitCommits: def read_patch_from_git(self, commit): # Run git to get the commit patch - return self.run_git('show', '--pretty=email', commit) + return self.run_git('show', '--pretty=email', '--no-textconv', commit) def run_git(self, *args): cmd = [ 'git' ] -- 2.39.2