diff options
Diffstat (limited to 'BaseTools/Scripts')
| -rwxr-xr-x | BaseTools/Scripts/PatchCheck.py | 9 |
1 files 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
|