mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4015: prefer --color to -c color.diff=always

Browse Source 
t4015 contains many color-related tests which need to
override the "is stdout a tty" check. They do so by setting
the color.diff config, but we can accomplish the same with
the --color option. Besides being shorter to type, switching
will prepare us for upcoming changes to "always" when see it
in config.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2017-10-03 09:40:19 -04:00
committed by Junio C Hamano
parent e433749d86
commit a655a59595
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
t/t4015-diff-whitespace.sh
View File

@ -821,7 +821,7 @@ test_expect_success 'diff that introduces a line with only tabs' '
echo "test" >x && echo "test" >x &&
git commit -m "initial" x && git commit -m "initial" x &&
echo "{NTN}" | tr "NT" "\n\t" >>x && echo "{NTN}" | tr "NT" "\n\t" >>x &&
git -c color.diff=always diff | test_decode_color >current && git diff --color | test_decode_color >current &&
cat >expected <<-\EOF && cat >expected <<-\EOF &&
<BOLD>diff --git a/x b/x<RESET> <BOLD>diff --git a/x b/x<RESET>
@ -851,7 +851,7 @@ test_expect_success 'diff that introduces and removes ws breakages' '
echo "2. and a new line " echo "2. and a new line "
} >x && } >x &&
git -c color.diff=always diff | git diff --color |
test_decode_color >current && test_decode_color >current &&
cat >expected <<-\EOF && cat >expected <<-\EOF &&
@ -923,15 +923,15 @@ test_expect_success 'ws-error-highlight test setup' '
test_expect_success 'test --ws-error-highlight option' ' test_expect_success 'test --ws-error-highlight option' '
git -c color.diff=always diff --ws-error-highlight=default,old | git diff --color --ws-error-highlight=default,old |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.default-old current && test_cmp expect.default-old current &&
git -c color.diff=always diff --ws-error-highlight=all | git diff --color --ws-error-highlight=all |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.all current && test_cmp expect.all current &&
git -c color.diff=always diff --ws-error-highlight=none | git diff --color --ws-error-highlight=none |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.none current test_cmp expect.none current
@ -939,15 +939,15 @@ test_expect_success 'test --ws-error-highlight option' '
test_expect_success 'test diff.wsErrorHighlight config' ' test_expect_success 'test diff.wsErrorHighlight config' '
git -c color.diff=always -c diff.wsErrorHighlight=default,old diff | git -c diff.wsErrorHighlight=default,old diff --color |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.default-old current && test_cmp expect.default-old current &&
git -c color.diff=always -c diff.wsErrorHighlight=all diff | git -c diff.wsErrorHighlight=all diff --color |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.all current && test_cmp expect.all current &&
git -c color.diff=always -c diff.wsErrorHighlight=none diff | git -c diff.wsErrorHighlight=none diff --color |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.none current test_cmp expect.none current
@ -955,18 +955,18 @@ test_expect_success 'test diff.wsErrorHighlight config' '
test_expect_success 'option overrides diff.wsErrorHighlight' ' test_expect_success 'option overrides diff.wsErrorHighlight' '
git -c color.diff=always -c diff.wsErrorHighlight=none \ git -c diff.wsErrorHighlight=none \
diff --ws-error-highlight=default,old | diff --color --ws-error-highlight=default,old |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.default-old current && test_cmp expect.default-old current &&
git -c color.diff=always -c diff.wsErrorHighlight=default \ git -c diff.wsErrorHighlight=default \
diff --ws-error-highlight=all | diff --color --ws-error-highlight=all |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.all current && test_cmp expect.all current &&
git -c color.diff=always -c diff.wsErrorHighlight=all \ git -c diff.wsErrorHighlight=all \
diff --ws-error-highlight=none | diff --color --ws-error-highlight=none |
test_decode_color >current && test_decode_color >current &&
test_cmp expect.none current test_cmp expect.none current