Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Temporary replace "diff-so-fancy" with bundled "diff-highlight"
Related to so-fancy/diff-so-fancy#35 and so-fancy/diff-so-fancy#296. The reason are incompatibility problems of "diff-so-fancy" (1) with the latest Git versions caused by changes in the diff logic. ```raw fatal: mismatched output from interactive.diffFilter hint: Your filter must maintain a one-to-one correspondence hint: between its input and output lines. ``` See so-fancy/diff-so-fancy#35 and so-fancy/diff-so-fancy#296 for details. Note that downgrading to a compatible Git version is not an option because versions <2.17.1 are effected by CVE-2018-11233 and and 11235 (2). To fix this problem for interactive patch mode (3) the filter will temporary be changed to the official diff-highlight (4) tool bundled with Git. ```diff [interactive] - diffFilter = diff-so-fancy + diffFilter = diff-highlight ``` References: (1) https://github.com/so-fancy/diff-so-fancy (2) https://github.com/git/git/blob/master/Documentation/RelNotes/2.17.1.txt#L7-L10 (3) https://github.com/arcticicestudio/igloo/blob/bb19634544f91c26d66e1f7f53a6bf06210fbaaf/snowblocks/git/gitconfig#L214-L220 (4) https://github.com/git/git/tree/master/contrib/diff-highlight Closes GH-125
- Loading branch information