diff options
| author | Leif Lindholm <leif@nuviainc.com> | 2020-04-22 16:08:01 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-07-03 11:20:01 +0000 |
| commit | 627d1d6693b0594d257dbe1a3363a8d4bd4d8307 (patch) | |
| tree | 3a183dfbfdaa1eda701c700091a1bd8936156098 /BaseTools/Conf | |
| parent | f43a14e3cff3fa45c30ff152c4172204a4458341 (diff) | |
| download | edk2-627d1d6693b0594d257dbe1a3363a8d4bd4d8307.tar.gz | |
BaseTools: convert diff.order to LF-only
SetupGit.py sets the git config option diff.orderFile to
{edk2 directory}/BaseTools/Conf/diff.order, to override the default order
in which files are shown in a diff/patch/whatever. This is in imitation
of what is done manually in Laszlo's Unkempt Guide.
However, the version currently in the tree is in CRLF format, which makes
git interpret e.g. *.c as matching on *.c<CR>, finding no matches and
failing to apply the desired reordering. Note: this is true regardless of
whether running on Linux or Windows.
Convert the file to LF-only to make it work as expected.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Conf')
| -rw-r--r-- | BaseTools/Conf/diff.order | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order index 4361817012..f1534f6c18 100644 --- a/BaseTools/Conf/diff.order +++ b/BaseTools/Conf/diff.order @@ -1,13 +1,13 @@ -#
-# Copyright (c) 2019, Linaro Ltd. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-*.dec
-*.dsc.inc
-*.dsc
-*.fdf
-*.inf
-*.h
-*.vfr
-*.c
+# +# Copyright (c) 2019, Linaro Ltd. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +*.dec +*.dsc.inc +*.dsc +*.fdf +*.inf +*.h +*.vfr +*.c |