From: "Bob Feng" <bob.c.feng@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"leif.lindholm@linaro.org" <leif.lindholm@linaro.org>
Cc: "Gao, Liming" <liming.gao@intel.com>
Subject: Re: [edk2-devel] [PATCH 5/9] BaseTools: fix line endings in SetupGit.py Conf files
Date: Thu, 19 Sep 2019 02:51:23 +0000 [thread overview]
Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D161536FD6@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20190918224331.23269-6-leif.lindholm@linaro.org>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----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 <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
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 <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
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 68b926ca94aa..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 index 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
next prev parent reply other threads:[~2019-09-19 2:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 22:43 [PATCH 0/9] Various line ending and encoding fixes Leif Lindholm
2019-09-18 22:43 ` [PATCH 1/9] BaseTools: add missing newlines at end of files Leif Lindholm
2019-09-19 2:50 ` Bob Feng
2019-09-18 22:43 ` [PATCH 2/9] EmbeddedPkg: add missing newline at end of TemplateResetSystemLib.inf Leif Lindholm
2019-09-18 22:43 ` [PATCH 3/9] NetworkPkg: add missing newline at end of file Leif Lindholm
2019-09-18 23:53 ` Siyuan, Fu
2019-09-18 22:43 ` [PATCH 4/9] EmbeddedPkg: delete outdated FdtLib README.txt Leif Lindholm
2019-09-18 22:43 ` [PATCH 5/9] BaseTools: fix line endings in SetupGit.py Conf files Leif Lindholm
2019-09-19 2:51 ` Bob Feng [this message]
2019-09-18 22:43 ` [PATCH 6/9] DynamicTablesPkg: fix .dsc line ending Leif Lindholm
2019-09-19 7:41 ` Sami Mujawar
2019-09-18 22:43 ` [PATCH 7/9] ArmPkg: ArmScmiDxe - convert .h to UTF-8 from 8859-x Leif Lindholm
2019-09-19 0:18 ` [edk2-devel] " Michael D Kinney
2019-09-18 22:43 ` [PATCH 8/9] BaseTools: correct line endings for ConvertFce Python script Leif Lindholm
2019-09-19 2:51 ` [edk2-devel] " Bob Feng
2019-09-18 22:43 ` [PATCH 9/9] EmbeddedPkg: convert Lauterbach README.txt to UTF-8 Leif Lindholm
2019-09-19 0:16 ` [edk2-devel] " Michael D Kinney
2019-09-19 2:39 ` [PATCH 0/9] Various line ending and encoding fixes Liming Gao
2019-09-19 10:02 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=08650203BA1BD64D8AD9B6D5D74A85D161536FD6@SHSMSX104.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox