summaryrefslogtreecommitdiff
path: root/t/t7004-tag.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-04 03:03:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-04 03:04:47 (GMT)
commitaebd23506ec952c1ca68d577afc59d3e2f7bd7ce (patch)
tree26f8c0cb722c3a993f958aa06fce7eaf76794345 /t/t7004-tag.sh
parent3c788e79b8570c9015f6077591c819862a7e39e8 (diff)
parent6be4595edb8e5b616c6e8b9fbc78b0f831fa2a87 (diff)
downloadgit-aebd23506ec952c1ca68d577afc59d3e2f7bd7ce.zip
git-aebd23506ec952c1ca68d577afc59d3e2f7bd7ce.tar.gz
git-aebd23506ec952c1ca68d577afc59d3e2f7bd7ce.tar.bz2
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/t7004-tag.sh')
-rwxr-xr-xt/t7004-tag.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index b545c33..4e62c50 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1907,13 +1907,13 @@ test_expect_success '%(color) omitted without tty' '
'
test_expect_success TTY '%(color) present with tty' '
- test_terminal env TERM=vt100 git tag $color_args >actual.raw &&
+ test_terminal git tag $color_args >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expect.color actual
'
-test_expect_success 'color.ui=always overrides auto-color' '
- git -c color.ui=always tag $color_args >actual.raw &&
+test_expect_success '--color overrides auto-color' '
+ git tag --color $color_args >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expect.color actual
'