Merge branch 'mh/tidy-ref-update-flags'

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 4e62c505fc9ce84adf4b0f74110b39d18c571670..a9af2de9960b345878ac0f85c33b1efd3e038d28 100755 (executable)
--- 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 &&