path: root/t/
diff options
authorJunio C Hamano <>2017-10-04 03:03:05 (GMT)
committerJunio C Hamano <>2017-10-04 03:04:47 (GMT)
commitaebd23506ec952c1ca68d577afc59d3e2f7bd7ce (patch)
tree26f8c0cb722c3a993f958aa06fce7eaf76794345 /t/
parent3c788e79b8570c9015f6077591c819862a7e39e8 (diff)
parent6be4595edb8e5b616c6e8b9fbc78b0f831fa2a87 (diff)
Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto
* jk/ui-color-always-to-auto-maint: color: make "always" the same as "auto" in config provide --color option for all ref-filter users t3205: use --color instead of color.branch=always t3203: drop "always" color test t6006: drop "always" color config tests t7502: use diff.noprefix for --verbose test t7508: use test_terminal for color output t3701: use test-terminal to collect color output t4015: prefer --color to -c color.diff=always test-terminal: set TERM=vt100
Diffstat (limited to 't/')
1 files changed, 3 insertions, 4 deletions
diff --git a/t/ b/t/
index 2274a4b..6358134 100755
--- a/t/
+++ b/t/
@@ -425,8 +425,7 @@ test_expect_success 'set up color tests' '
test_expect_success TTY '%(color) shows color with a tty' '
- test_terminal env TERM=vt100 \
- git for-each-ref --format="$color_format" >actual.raw &&
+ test_terminal git for-each-ref --format="$color_format" >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expected.color actual
@@ -436,8 +435,8 @@ test_expect_success '%(color) does not show color without tty' '
test_cmp expected.bare actual
-test_expect_success 'color.ui=always can override tty check' '
- git -c color.ui=always for-each-ref --format="$color_format" >actual.raw &&
+test_expect_success '--color can override tty check' '
+ git for-each-ref --color --format="$color_format" >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expected.color actual