]> git.proxmox.com Git - mirror_edk2.git/commit
BaseTools: convert diff.order to LF-only
authorLeif Lindholm <leif@nuviainc.com>
Wed, 22 Apr 2020 15:08:01 +0000 (16:08 +0100)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fri, 3 Jul 2020 11:20:01 +0000 (11:20 +0000)
commit627d1d6693b0594d257dbe1a3363a8d4bd4d8307
tree3a183dfbfdaa1eda701c700091a1bd8936156098
parentf43a14e3cff3fa45c30ff152c4172204a4458341
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>
BaseTools/Conf/diff.order