Reviewed-by: Bob Feng <[email protected]> -----Original Message----- From: [email protected] <[email protected]> On Behalf Of Leif Lindholm Sent: Thursday, July 2, 2020 11:40 PM To: [email protected] Cc: Feng, Bob C <[email protected]>; Gao, Liming <[email protected]> Subject: [edk2-devel] [PATCH 1/2] 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 <[email protected]> Cc: Liming Gao <[email protected]> Signed-off-by: Leif Lindholm <[email protected]> --- 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 e38cf61f93da..527761986d4c 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.20.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61999): https://edk2.groups.io/g/devel/message/61999 Mute This Topic: https://groups.io/mt/75260900/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
