From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.15008.1595408980486687729 for ; Wed, 22 Jul 2020 02:09:40 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: guomin.jiang@intel.com) IronPort-SDR: WgfJLX8va6NiXGsGO/bYY/eLQxgApKqTCApee34kB9sNfhVM6SAZdGZY0Gsl/+2l0WphVrNKS1 p6TSgiS0zQ7Q== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="129863217" X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="129863217" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2020 02:09:38 -0700 IronPort-SDR: ddK5DWK4b48tIx/vcZfQnJBvuY8bNcdtPQ6QHbYzq18w7jQTUxjcSpjqsNHzxwg46H+u0RPGSq yYX3YTT9NDUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="284159217" Received: from guominji-mobl.ccr.corp.intel.com ([10.238.13.140]) by orsmga003.jf.intel.com with ESMTP; 22 Jul 2020 02:09:36 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH v2 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Date: Wed, 22 Jul 2020 17:09:35 +0800 Message-Id: <20200722090935.1895-1-guomin.jiang@intel.com> X-Mailer: git-send-email 2.25.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit If the submodule is upgraded, it will not end with the CRLF. it make no sense that check the submodule upgrade. Signed-off-by: Guomin Jiang Cc: Bob Feng Cc: Liming Gao --- 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