From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.158.1593733675551658550 for ; Thu, 02 Jul 2020 16:47:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=dd2lsZDw; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: bob.c.feng@intel.com) IronPort-SDR: QT7Wt4euvmR9Q3XjN8UJYKu58l6o+fXw4ZXlExflA/WKzFA2sqWuttFn/xX33eTuZEhVYQowde 74EEpLPT1urQ== X-IronPort-AV: E=McAfee;i="6000,8403,9670"; a="147062161" X-IronPort-AV: E=Sophos;i="5.75,306,1589266800"; d="scan'208";a="147062161" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2020 16:47:54 -0700 IronPort-SDR: V13intSnl5lOr2CQq1zOzfB0kaYX3c8V/jUokhG1QcS5XYaOltMG71no26T6+68mHfNzdcIwNh aWs0ndsEMBXA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,306,1589266800"; d="scan'208";a="265831663" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga007.fm.intel.com with ESMTP; 02 Jul 2020 16:47:54 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 2 Jul 2020 16:47:53 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 2 Jul 2020 16:47:53 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 2 Jul 2020 16:47:53 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.105) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 2 Jul 2020 16:47:53 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZIEa+XCcNNBkd7aFt/nsUFTB3MV/EWugB+pQlaeMPG4HJqMfx+MqQG9FaI8GW0KPl4eir2HCvn7DF06KliiM5sYXW4vSPuAtJLsZTN261irQdY2QO7npYY6q6x8O/VWhYxlmnfa0ycsaz/mAEVv5zP0lsGqAUgjPb4nV8tktC5urH2kjW9yCda7/NYvbH5Y/alHmaTdAqE07L4AxzCuymT1ex2h6jgYzXDgiFnY5bQsw2SuaKFmlMUOraKhGZO2AK/TNjZ6bnyxM9GyY/mOQrDJlAHw2CNxmLQTFCsAJUoqcEbkXql62/DHTkF8KMqXnA1QLfil+g7bKp3B4Q4j6dQ== 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=cBIwUeyJOqLO3+gNeJO+sIy1coGTr9IGQPnOlhmblqo=; b=laCFdcv/beOAf5Ah6JsVzEH4P5+gM82GoZtkkig/Kpm+JbtVMtQFWgWrHWd+gl9ocqpVZyhkncNaKKK/5+SucgRYOYxfz/eOITC8RohP7a7A+UypVc8R2hQcBsdBQSQcf6ogbTAM6dEHZ/mqIiBHPOCVIUyKH2ni/AuUJgTguoIZ3Vh2Ty7DwW5gbaocpak1xEoO+uVxXewVov/EqVrJvI0ehjz/c9GSb1diWtoMtm2tggs3y8yt6Hucqy+lQOhleLhD3U9EHTER1YCO75o22mqHpLKEu4en5DHOhBzZjlbngvnpSB6I63REX2fexOQdlw2mkLldn7zZvTbMcPSbbw== 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=cBIwUeyJOqLO3+gNeJO+sIy1coGTr9IGQPnOlhmblqo=; b=dd2lsZDw3FnvacjbwxDVOi4lB9WTu9F8sRzLlyTUi8TYX0Zim5MkroEQCWazWKbM94vEhi+EHGUbalAnopXeLV2Gg6idqTIGHH5oht+euTZmlEkPxIQp9CVXjoChVe1/e2zR51E+5pZTqBEu3J24p4v4rd/DfueolrmjP+hTOtY= Received: from BN6PR11MB0068.namprd11.prod.outlook.com (2603:10b6:405:69::17) by BN6PR1101MB2098.namprd11.prod.outlook.com (2603:10b6:405:52::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20; Thu, 2 Jul 2020 23:47:51 +0000 Received: from BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::6870:82d3:5bde:4153]) by BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::6870:82d3:5bde:4153%6]) with mapi id 15.20.3131.034; Thu, 2 Jul 2020 23:47:51 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "leif@nuviainc.com" CC: "Gao, Liming" Subject: Re: [edk2-devel] [PATCH 1/2] BaseTools/PatchCheck.py: add exception for diff orderfile Thread-Topic: [edk2-devel] [PATCH 1/2] BaseTools/PatchCheck.py: add exception for diff orderfile Thread-Index: AQHWUIcKNjlCYnwcK0Op21rafpJBn6j09Uhg Date: Thu, 2 Jul 2020 23:47:51 +0000 Message-ID: References: <20200702153934.25262-1-leif@nuviainc.com> <20200702153934.25262-2-leif@nuviainc.com> In-Reply-To: <20200702153934.25262-2-leif@nuviainc.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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: a55db144-f85c-4c23-7c32-08d81ee2557c x-ms-traffictypediagnostic: BN6PR1101MB2098: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-forefront-prvs: 0452022BE1 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LjqCa2FlzpzcxJQoSZKgJkO4hzlsUnDbYNeuLGjpnoZH4jcfHitP+GjhkIAxMhJdnOBCBDyYNzI7VFsmPXi9f98sNY2gKo6A03f46nGeACdrc3aQrWZHcv+rdV2+sx6+InflmIkwf9/UVUEHvQSRegBo++ebb+mLglNsCw57ZIscC/LQHHv6FRc6YJUbbmfr9+h/CDx06yQ//m9oCoHUCG3KPtUer6xTkvTb5kum1mKagX4il8kyqZDsIl6ntgWV3kX0iE7WsPD099AYaSm/Ch6ukUm2vzcr7aDeqEjX7nWL+6yDd/oKVNB927Nt3+E1DB6Mol3PBBh4xs/42tdh0WNL7CeTC6ygv5QL+EuoFLz1fFAIFNXbjMMQLhr0rF35neIXioKDCnC3WPwNW/fYvQ== 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)(136003)(376002)(346002)(396003)(39860400002)(366004)(53546011)(83380400001)(33656002)(478600001)(8936002)(55016002)(86362001)(8676002)(110136005)(966005)(316002)(107886003)(9686003)(7696005)(186003)(6506007)(2906002)(4326008)(26005)(66476007)(71200400001)(76116006)(66446008)(64756008)(66556008)(52536014)(66946007)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: xSkr603mgChfQZyZrxOXta69PBSbPXNG7FSdAHmFQNZCtN1H4lnlZOKzscxB/V3RKNKCNnjufyoNzZdzdzWlEe4Gcrv/4P3cugCXMM4TpQ4k/D1rW/qeIe/qgMPCAEc7Vf3e+sY616yZkaq2V7pl2iaQzESAYHon9YtBhZwBHdHaiu6MMkA0y5CfsgBX3ZGJC2Qiy1XhKtf/zHd1Y5rPkimV2tezN5z6pXxlnSQOqlPxRSziZJYS25KFEXxA9ZoAoMVPCDkdqWPaZBuPPfayB3iHcy71BRq8fe+P8+WsJmO1pUU1x5ZHhgYSrLOPMin8j9YVIiu2Mr/37s6fyK9n2+IQxH7zZ/Lghpe3ny2MP99CNk4/Ej8GmRp3vkxeZjRXYrgcz3pT0uYrx6sE35318fT7OhZWHmUbEJomcEmBWiLqRO3OaMaySGc3VwuT8Ah7n9+eZhvt+WFjrfg3mdZLLWN7SDdjRBKzfaGeEuFUtdmIZs2WLrd01pFX1LY45Lji 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: a55db144-f85c-4c23-7c32-08d81ee2557c X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jul 2020 23:47:51.6869 (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: z6Lh4/dChk+CJBp3pmHc2UBoffQE4Li8eNgQkn+UVDA+KLs5NNheLYMc6CA+VOVqXE7XVIArthMmPXGkAtFcqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1101MB2098 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: devel@edk2.groups.io On Behalf Of Leif Lindho= lm Sent: Thursday, July 2, 2020 11:40 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Gao, Liming Subject: [edk2-devel] [PATCH 1/2] BaseTools/PatchCheck.py: add exception f= or diff orderfile SetupGit.py adds BaseTools/Conf/diff.order as a diff orderfile, but that f= ile currently has CRLF line endings, which causes all pattern matches to fa= il and the ordering remaining unaffected. Add an exception to PatchCheck.py (to the existing .gitmodules clause), so= that we can merge the fix to the config file. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm --- BaseTools/Scripts/PatchCheck.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchChec= k.py index e38cf61f93da..527761986d4c 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -395,11 +395,12 @@ class GitDiffCheck: # they are identified by their path. # self.force_crlf =3D False - if self.filename =3D=3D '.gitmodules': + if self.filename =3D=3D '.gitmodules' or \ + self.filename =3D=3D 'BaseTools/Conf/diff.order': # - # .gitmodules is updated by git and uses tabs and LF = line - # endings. Do not enforce no tabs and do not enforce - # CR/LF line endings. + # .gitmodules and diff orderfiles are used internally= by git + # use tabs and LF line endings. Do not enforce no ta= bs and + # do not enforce CR/LF line endings. # self.force_crlf =3D False self.force_notabs =3D False -- 2.20.1