From 627d1d6693b0594d257dbe1a3363a8d4bd4d8307 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Wed, 22 Apr 2020 16:08:01 +0100 Subject: [PATCH] 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, 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 Cc: Liming Gao Signed-off-by: Leif Lindholm Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao --- BaseTools/Conf/diff.order | 26 +++++++++++++------------- 1 file 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 -- 2.39.2