Re: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule.

["Liming Gao" <liming.gao@intel.com>]

Guomin:
  OK. Please add this information in the patch for better reading. With this change, Reviewed-by: Liming Gao <liming.gao@intel.com>

Thanks
Liming
-----Original Message-----
From: Jiang, Guomin <guomin.jiang@intel.com> 
Sent: 2020年7月21日 18:38
To: Gao, Liming <liming.gao@intel.com>; devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>
Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule.

It is used to judge if the current change is for submodule.

The attribute of submodule is 160000, just like the file attribute of file is 10644.

Normally, the changed file will begin with 'diff --git' and the next line like ' index 954f66c056e..04300e71f38 100644' which end with the attribute, and changed submodule is similar.

> -----Original Message-----
> From: Gao, Liming <liming.gao@intel.com>
> Sent: Tuesday, July 21, 2020 1:57 PM
> To: Jiang, Guomin <guomin.jiang@intel.com>; devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>
> Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when 
> upgrade submodule.
> 
> Guomin:
>   +                   self.lines[self.line_num+1].endswith('160000\n') or
> 
>   What means for this line?
> 
> 
> Thanks
> Liming
> -----Original Message-----
> From: Jiang, Guomin <guomin.jiang@intel.com>
> Sent: 2020年7月21日 10:59
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming 
> <liming.gao@intel.com>
> Subject: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when 
> upgrade submodule.
> 
> When i upgrade openssl to 1.1.1g, error occurred when run PatchCheck.py.
> The reason is that the submodule will end with LF, but it will check 
> based on file rule, it make no sense and need ignore the check.
> 
> 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 | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/BaseTools/Scripts/PatchCheck.py 
> b/BaseTools/Scripts/PatchCheck.py index 7db0775d14d1..46b9936c6576
> 100755
> --- a/BaseTools/Scripts/PatchCheck.py
> +++ b/BaseTools/Scripts/PatchCheck.py
> @@ -405,12 +405,16 @@ class GitDiffCheck:
>                      #
>                      self.force_crlf = False
>                  if self.filename == '.gitmodules' or \
> +                   self.lines[self.line_num+1].endswith('160000\n') 
> + or \
>                     self.filename == 'BaseTools/Conf/diff.order':
>                      #
>                      # .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.
>                      #
> +                    # When update submodule, it will encode with LF line and do
> +                    # not enforce CR/LF line endings.
> +                    #
>                      self.force_crlf = False
>                      self.force_notabs = False
>              elif len(line.rstrip()) != 0:
> --
> 2.25.1.windows.1