diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 0bfc7ffac8..4da30e5a1e 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -810,11 +810,20 @@ test_expect_success 'setup diff colors' ' git config color.diff.old red && git config color.diff.new green && git config color.diff.commit yellow && - git config color.diff.whitespace "normal red" && + git config color.diff.whitespace blue && - git config core.autocrlf false && + git config core.autocrlf false +' + +test_expect_success 'diff that introduces a line with only tabs' ' + git config core.whitespace blank-at-eol && + git reset --hard && + echo "test" >x && + git commit -m "initial" x && + echo "{NTN}" | tr "NT" "\n\t" >>x && + git -c color.diff=always diff | test_decode_color >current && - cat >expected <<-\EOF + cat >expected <<-\EOF && <BOLD>diff --git a/x b/x<RESET> <BOLD>index 9daeafb..2874b91 100644<RESET> <BOLD>--- a/x<RESET> @@ -822,18 +831,10 @@ test_expect_success 'setup diff colors' ' <CYAN>@@ -1 +1,4 @@<RESET> test<RESET> <GREEN>+<RESET><GREEN>{<RESET> - <GREEN>+<RESET><BRED> <RESET> + <GREEN>+<RESET><BLUE> <RESET> <GREEN>+<RESET><GREEN>}<RESET> EOF -' -test_expect_success 'diff that introduces a line with only tabs' ' - git config core.whitespace blank-at-eol && - git reset --hard && - echo "test" >x && - git commit -m "initial" x && - echo "{NTN}" | tr "NT" "\n\t" >>x && - git -c color.diff=always diff | test_decode_color >current && test_cmp expected current ' |