From c267eb889fe1244840eb4fd067fe0d85e3cc271f Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 2 Jul 2020 23:39:33 +0800 Subject: [PATCH] BaseTools/PatchCheck.py: add exception for diff orderfile SetupGit.py adds BaseTools/Conf/diff.order as a diff orderfile, but that file currently has CRLF line endings, which causes all pattern matches to fail and the ordering remaining unaffected. Add an exception to PatchCheck.py (to the existing .gitmodules clause), so that we can merge the fix to the config file. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm Reviewed-by: Bob Feng --- BaseTools/Scripts/PatchCheck.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index e38cf61f93..527761986d 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -395,11 +395,12 @@ class GitDiffCheck: # they are identified by their path. # self.force_crlf = False - if self.filename == '.gitmodules': + if self.filename == '.gitmodules' or \ + self.filename == 'BaseTools/Conf/diff.order': # - # .gitmodules is updated by git and uses tabs and LF line - # endings. Do not enforce no tabs and do not enforce - # CR/LF line endings. + # .gitmodules and diff orderfiles are used internally by git + # use tabs and LF line endings. Do not enforce no tabs and + # do not enforce CR/LF line endings. # self.force_crlf = False self.force_notabs = False -- 2.39.2