From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: bob.c.feng@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Wed, 18 Sep 2019 19:51:27 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Sep 2019 19:51:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,522,1559545200"; d="scan'208";a="186660403" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga008.fm.intel.com with ESMTP; 18 Sep 2019 19:51:26 -0700 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 18 Sep 2019 19:51:26 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 18 Sep 2019 19:51:25 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.32]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.92]) with mapi id 14.03.0439.000; Thu, 19 Sep 2019 10:51:23 +0800 From: "Bob Feng" To: "devel@edk2.groups.io" , "leif.lindholm@linaro.org" CC: "Gao, Liming" Subject: Re: [edk2-devel] [PATCH 5/9] BaseTools: fix line endings in SetupGit.py Conf files Thread-Topic: [edk2-devel] [PATCH 5/9] BaseTools: fix line endings in SetupGit.py Conf files Thread-Index: AQHVbnKNO4ur9rnvKEip0lNoMMR596cyTU3Q Date: Thu, 19 Sep 2019 02:51:23 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D161536FD6@SHSMSX104.ccr.corp.intel.com> References: <20190918224331.23269-1-leif.lindholm@linaro.org> <20190918224331.23269-6-leif.lindholm@linaro.org> In-Reply-To: <20190918224331.23269-6-leif.lindholm@linaro.org> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: bob.c.feng@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 [mailto:devel@edk2.groups.io] On Behalf Of Leif= Lindholm Sent: Thursday, September 19, 2019 6:43 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Gao, Liming Subject: [edk2-devel] [PATCH 5/9] BaseTools: fix line endings in SetupGit.= py Conf files A file header license/copyright header copied around in commit 5b3e695d8ac5 ("BaseTools: add centralized location for git config files") = was missing a CR - add it in both faulty locations. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm --- BaseTools/Conf/diff.order | 2 +- BaseTools/Conf/gitattributes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order index 6= 8b926ca94aa..4361817012c9 100644 --- a/BaseTools/Conf/diff.order +++ b/BaseTools/Conf/diff.order @@ -2,7 +2,7 @@ # Copyright (c) 2019, Linaro Ltd. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent -# +# *.dec *.dsc.inc *.dsc diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes i= ndex 9b6ab81a475b..58b93e9d4c27 100644 --- a/BaseTools/Conf/gitattributes +++ b/BaseTools/Conf/gitattributes @@ -2,7 +2,7 @@ # Copyright (c) 2019, Linaro Ltd. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent -# +# *.efi -diff *.EFI -diff *.bin -diff -- 2.20.1