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, 2 insertions, 3 deletions
diff --git a/t/ b/t/
index 9343550..4f1e16b 100755
--- a/t/
+++ b/t/
@@ -12,7 +12,6 @@ test_expect_success 'set up some sample branches' '
# choose non-default colors to make sure config
# is taking effect
test_expect_success 'set up some color config' '
- git config color.branch always &&
git config color.branch.local blue &&
git config color.branch.remote yellow &&
git config color.branch.current cyan
@@ -24,7 +23,7 @@ test_expect_success 'regular output shows colors' '
- git branch -a >actual.raw &&
+ git branch --color -a >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expect actual
@@ -36,7 +35,7 @@ test_expect_success 'verbose output shows colors' '
<BLUE>other <RESET> $oid foo
<YELLOW>remotes/origin/master<RESET> $oid foo
- git branch -v -a >actual.raw &&
+ git branch --color -v -a >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expect actual