summaryrefslogtreecommitdiffstats
path: root/BaseTools
diff options
context:
space:
mode:
authorJiang, Guomin <Guomin.Jiang@intel.com>2020-07-22 18:33:26 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2020-07-24 03:23:47 +0000
commitff2655d1a4ce8f2c85b1a5f09b85fb4f51fe13f1 (patch)
tree3fd579eead81cfce553fc8b198d8274c9fef00d7 /BaseTools
parente43d0884ed93ffd8044e48e8d5d2d010a46aab33 (diff)
downloadedk2-ff2655d1a4ce8f2c85b1a5f09b85fb4f51fe13f1.tar.gz
edk2-ff2655d1a4ce8f2c85b1a5f09b85fb4f51fe13f1.tar.bz2
edk2-ff2655d1a4ce8f2c85b1a5f09b85fb4f51fe13f1.zip
BaseTools/Scripts: Ignore the CRLF check when upgrade submodule.
If the submodule is upgraded, skip the CRLF check as it isn't change for file. Signed-off-by: Guomin Jiang <guomin.jiang@intel.com> Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Diffstat (limited to 'BaseTools')
-rwxr-xr-xBaseTools/Scripts/PatchCheck.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py
index 7db0775d14..ca0849b77b 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -502,7 +502,7 @@ class GitDiffCheck:
stripped = line.rstrip()
- if self.force_crlf and eol != '\r\n':
+ if self.force_crlf and eol != '\r\n' and (line.find('Subproject commit') == -1):
self.added_line_error('Line ending (%s) is not CRLF' % repr(eol),
line)
if self.force_notabs and '\t' in line: