* [PATCH v3 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule.
@ 2020-07-22 10:33 Guomin Jiang
2020-07-23 7:32 ` Bob Feng
0 siblings, 1 reply; 3+ messages in thread
From: Guomin Jiang @ 2020-07-22 10:33 UTC (permalink / raw)
To: devel; +Cc: Bob Feng, Liming Gao
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>
---
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 7db0775d14d1..ca0849b77bbe 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:
--
2.25.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule.
2020-07-22 10:33 [PATCH v3 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule Guomin Jiang
@ 2020-07-23 7:32 ` Bob Feng
2020-07-27 0:55 ` Guomin Jiang
0 siblings, 1 reply; 3+ messages in thread
From: Bob Feng @ 2020-07-23 7:32 UTC (permalink / raw)
To: Jiang, Guomin, devel@edk2.groups.io; +Cc: Gao, Liming
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----Original Message-----
From: Jiang, Guomin <guomin.jiang@intel.com>
Sent: Wednesday, July 22, 2020 6:33 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH v3 1/1] 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>
---
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 7db0775d14d1..ca0849b77bbe 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:
--
2.25.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule.
2020-07-23 7:32 ` Bob Feng
@ 2020-07-27 0:55 ` Guomin Jiang
0 siblings, 0 replies; 3+ messages in thread
From: Guomin Jiang @ 2020-07-27 0:55 UTC (permalink / raw)
To: Feng, Bob C, devel@edk2.groups.io; +Cc: Gao, Liming
Checked in ff2655d1a4ce8f2c85b1a5f09b85fb4f51fe13f1.
> -----Original Message-----
> From: Feng, Bob C <bob.c.feng@intel.com>
> Sent: Thursday, July 23, 2020 3:33 PM
> To: Jiang, Guomin <guomin.jiang@intel.com>; devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: RE: [PATCH v3 1/1] BaseTools/Scripts: Ignore the CRLF check when
> upgrade submodule.
>
> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
>
> -----Original Message-----
> From: Jiang, Guomin <guomin.jiang@intel.com>
> Sent: Wednesday, July 22, 2020 6:33 PM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> <liming.gao@intel.com>
> Subject: [PATCH v3 1/1] 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>
> ---
> 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 7db0775d14d1..ca0849b77bbe
> 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:
> --
> 2.25.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-27 0:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-22 10:33 [PATCH v3 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule Guomin Jiang
2020-07-23 7:32 ` Bob Feng
2020-07-27 0:55 ` Guomin Jiang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox