Branch: refs/heads/master
  Home:   https://github.com/tianocore/edk2
  Commit: 627d1d6693b0594d257dbe1a3363a8d4bd4d8307
      
https://github.com/tianocore/edk2/commit/627d1d6693b0594d257dbe1a3363a8d4bd4d8307
  Author: Leif Lindholm <[email protected]>
  Date:   2020-07-03 (Fri, 03 Jul 2020)

  Changed paths:
    M BaseTools/Conf/diff.order

  Log Message:
  -----------
  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 <[email protected]>
Cc: Liming Gao <[email protected]>
Signed-off-by: Leif Lindholm <[email protected]>
Reviewed-by: Philippe Mathieu-Daude <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Reviewed-by: Liming Gao <[email protected]>




_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to