summaryrefslogtreecommitdiff
path: root/t/t7004-tag.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-18 01:19:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-18 01:19:08 (GMT)
commit1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c (patch)
treeda278177d16ce137f6b19de518b149ba6edcbdca /t/t7004-tag.sh
parent570676e011d9c8057744e03067553c4802e5adb4 (diff)
parentb521fd122865dca88b99d05344ec189d39efcefb (diff)
downloadgit-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.zip
git-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.gz
git-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.bz2
Merge branch 'jk/ref-filter-colors-fix'
This is the "theoretically more correct" approach of simply stepping back to the state before plumbing commands started paying attention to "color.ui" configuration variable. Let's run with this one. * jk/ref-filter-colors-fix: tag: respect color.ui config Revert "color: check color.ui in git_default_config()" Revert "t6006: drop "always" color config tests" Revert "color: make "always" the same as "auto" in config"
Diffstat (limited to 't/t7004-tag.sh')
-rwxr-xr-xt/t7004-tag.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 4e62c50..a9af2de 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1918,6 +1918,12 @@ test_expect_success '--color overrides auto-color' '
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_decode_color <actual.raw >actual &&
+ test_cmp expect.color actual
+'
+
test_expect_success 'setup --merged test tags' '
git tag mergetest-1 HEAD~2 &&
git tag mergetest-2 HEAD~1 &&