From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web12.10491.1595383698458027699 for ; Tue, 21 Jul 2020 19:08:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=kdQY2AsO; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: bob.c.feng@intel.com) IronPort-SDR: 7bJxZk3803RBiqW8Qt79y8jKszwWLR8JQoaVkSTYgoDMiNQobMqLy10NsvOS7PmpE8TxKaDOFl FElfg6jpEgMA== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="138343235" X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="138343235" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 19:08:17 -0700 IronPort-SDR: JYuoDMZuVrjD21HGl6ZlB2f/+SLBruL/4d+9U5tP75o/E8+0h6vtAsi/EN41Oqh+w/gYXEszfm qJgoG3NEwQ4w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="318526070" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2020 19:08:17 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 21 Jul 2020 19:08:16 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 21 Jul 2020 19:08:16 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.108) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:08:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aMeDcMSfcyn9zAiNpOzcXtgPnOc9ur+QjGabzPh5shkUuzUkYI2rwATsNoFq7LZYTFzNG3iF/4fMLA7rpV3oxDcXiQsA5TUwGr9611ASeeV6s0WyprIVUOe+ebTdOw4geKQDRWL342d3XzFoXl/UzK1eYXH3Q8BWCl0a1zSQfGQB8J+Euyy3gu+T5L4jwmj+rbDTHSbJsUO/iQyrOvgRVk+TOAd01d+kA6DWEmkqKc1OTNDe8ez0Ew1vnXNeHkLiwkB0Vj4sjQ0gpaP6+O2vVKxXKigG0ve3FzWODI4N2j9OvJlIzEzKpJFpAgc6btHGBeB3yRV30hYAEdYuxM0uaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g+vQAGQPhivK/l+t64/9XA/I6x16c1O8dC58zwV8hrw=; b=OvoX0dKkGvWGDf1U3dut3iPVl6iiVr8SDKwARHUBHVDwJCGcEaihJFXizwNwS7AmBPbNxBMudi/hyJct67h/1prcQbzY0DNQ6JlcFkYdMBE+dXFyus84RSEyusTwvyWmFIf+gQE8BWUCBuJW26RIcHVYrb0dhKiQfqDLvAy+lOxamBccofHQuZIGq1sWtb9sQyPQ6TH08+SVJqWLiY54nLYedOWjOMoM3RB9tBKnHF41SSABiNIiGNfMxebYXHaG9wNJ+TDaFefU7YYEeIUWG78GPVLCy2fQ8pY5rrZkna/kuFaFQi3sD6bmf5PPtNAYIHm3DmNxVrKQJ3PrL23EAA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g+vQAGQPhivK/l+t64/9XA/I6x16c1O8dC58zwV8hrw=; b=kdQY2AsOuY9P8EbYPVmKQgO0QBTZ7lEDtzlJ67CdsfBqF52/jKfXIg45KIpbPgwU8XzcaoX4OjhybXfKks/IS+I7PSBpyIBCzqN9u/f9BVb2q0hRQq0zVw0jpljVZBsWjN7SeWM2h1EfEto6NA/qzVcgNDxGN+onzpQoXB0vSBM= Received: from BN6PR11MB0068.namprd11.prod.outlook.com (2603:10b6:405:69::17) by BN6PR11MB1825.namprd11.prod.outlook.com (2603:10b6:404:104::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.23; Wed, 22 Jul 2020 02:08:15 +0000 Received: from BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::f4b6:406b:26fc:c069]) by BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::f4b6:406b:26fc:c069%3]) with mapi id 15.20.3195.026; Wed, 22 Jul 2020 02:08:15 +0000 From: "Bob Feng" To: "Jiang, Guomin" , "Gao, Liming" , "devel@edk2.groups.io" Subject: Re: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Thread-Topic: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Thread-Index: AQHWXwrk8vWOY933A0qkonvtL0kQLqkRiVCAgABOv4CAAQHKkA== Date: Wed, 22 Jul 2020 02:08:15 +0000 Message-ID: References: <20200721025846.2249-1-guomin.jiang@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 071c68d9-7069-4bf6-c58a-08d82de4182c x-ms-traffictypediagnostic: BN6PR11MB1825: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1468; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XX33do//9eDOC3qdnoz6aTIn1avI3dVKnC6lYebiH0bBxOSrgKMggn2fWaXiFY9Y+v2fjEL50tZFW0Bxtg4tnf45qQxR71yylTlXd4CZfvg3WIB8zJvapRUaO2/2Nc5QS1I5Gx9e3eOi84wjDI8Ul31uE/OFbuwscDw1OILxbQ3bmp642o+TNJ6Rsrqxi0Jh+N7cH69uyNFCwHuBJCl6lNlLI5toC+GXoFScxUgR8/JqVov958vnvQJFZVJ/CVG3+U9V0gV2xBAzV42GTNiaj65xP5XoV9OHedTktmyQqcPumdDRWDgqRWcskREEBj6LfX2tK8cjgCL2VzYO1+1U+A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB0068.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(376002)(346002)(366004)(136003)(110136005)(478600001)(7696005)(52536014)(8676002)(2906002)(9686003)(55016002)(33656002)(186003)(5660300002)(316002)(26005)(66946007)(76116006)(86362001)(66556008)(66446008)(64756008)(53546011)(66476007)(71200400001)(8936002)(6506007)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: EPaRCBOExOARIJE5S0oykckCpgMah7f93cswUQHgMqmrT9jE8otnA1tYCRecYEe+ZKQOaICLkJ98LJI4+A0wp0mz5sDr3vniRDwfOFms0/kWTjYdS2PTQ3naG8Epe9TCjvzuuTCPddrmZDkWBT6O/ZpeV5Ts5JjAwE7UU3ESPLuuzku+OwSvF6nCNTBmDqBYjsB9PnMGV0hjLCqNYuVJX4nGgc7QDRpEkRCUcn2sMiFSDwryAv3XNi3brf+TmvbbJwqtl+wQ88zOATaB84Sc6eW4cThl+HXL+NpaE9MglyJUnuskFSlaRiI1bD/NxVZblMkeFzY5DGYZdiJgP03xBacHj3HQmpXTlZbZPFzU+deUwVGo6SzlF4oC6YnIU8+KKxohpXESRhfCznI7Bw4j405pYzGhz10RRW6NMoxfUJVVggKTsiMfSY069NI4c3GIRyxePFmDf1wMIfQnfjptSrRE63LGMXqfBdyvVoB0YaSf85GB65/U4e+Rg5bbEyd1 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB0068.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 071c68d9-7069-4bf6-c58a-08d82de4182c X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2020 02:08:15.2277 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: s246Pip+2nb+Jr6NBceZLogxjyp3U51qp0NLKSfJjN0IaUKLM4GTQE1KTk+h0j15az//elw3Vk/K8DbcyWlc1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1825 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Guomin, I have two comments. 1. Please only descript the patch's function in the commit message. 2. The file attribute is not always the next line of the line starts with "= diff --git" Thanks, Bob -----Original Message----- From: Jiang, Guomin =20 Sent: Tuesday, July 21, 2020 6:38 PM To: Gao, Liming ; devel@edk2.groups.io Cc: Feng, Bob C Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgr= ade 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 l= ike ' index 954f66c056e..04300e71f38 100644' which end with the attribute, = and changed submodule is similar. > -----Original Message----- > From: Gao, Liming > Sent: Tuesday, July 21, 2020 1:57 PM > To: Jiang, Guomin ; devel@edk2.groups.io > Cc: Feng, Bob C > Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when=20 > upgrade submodule. >=20 > Guomin: > + self.lines[self.line_num+1].endswith('160000\n') or >=20 > What means for this line? >=20 >=20 > Thanks > Liming > -----Original Message----- > From: Jiang, Guomin > Sent: 2020=1B$BG/=1B(B7=1B$B7n=1B(B21=1B$BF|=1B(B 10:59 > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming=20 > > Subject: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when=20 > upgrade submodule. >=20 > 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=20 > based on file rule, it make no sense and need ignore the check. >=20 > Signed-off-by: Guomin Jiang > Cc: Bob Feng > Cc: Liming Gao > --- > BaseTools/Scripts/PatchCheck.py | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/BaseTools/Scripts/PatchCheck.py=20 > 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 =3D False > if self.filename =3D=3D '.gitmodules' or \ > + self.lines[self.line_num+1].endswith('160000\n')=20 > + or \ > self.filename =3D=3D 'BaseTools/Conf/diff.order': > # > # .gitmodules and diff orderfiles are used internall= y by git > # use tabs and LF line endings. Do not enforce no t= abs 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 =3D False > self.force_notabs =3D False > elif len(line.rstrip()) !=3D 0: > -- > 2.25.1.windows.1