diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 0bfc7ffac8b..4da30e5a1ed 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -810,21 +810,9 @@ 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 && - - cat >expected <<-\EOF - diff --git a/x b/x - index 9daeafb..2874b91 100644 - --- a/x - +++ b/x - @@ -1 +1,4 @@ - test - +{ - + - +} - EOF + git config core.autocrlf false ' test_expect_success 'diff that introduces a line with only tabs' ' @@ -834,6 +822,19 @@ test_expect_success 'diff that introduces a line with only tabs' ' 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 && + diff --git a/x b/x + index 9daeafb..2874b91 100644 + --- a/x + +++ b/x + @@ -1 +1,4 @@ + test + +{ + + + +} + EOF + test_cmp expected current '