aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 12:16:58 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-22 12:16:58 -0800
commit5d509d5e1cf1feb9e218b431f4ea41b10e39d06e (patch)
tree7c40aabc32458afa6500d585abff62acf4163b5d /t
parent447c39a9b25e222a96711f7736078e4f33001388 (diff)
parentcb357221a402c55b23bf99ec9f3b361709d45fa7 (diff)
downloadgit-5d509d5e1cf1feb9e218b431f4ea41b10e39d06e.tar.gz
git-5d509d5e1cf1feb9e218b431f4ea41b10e39d06e.tar.xz
Merge branch 'jk/colors-fix' into maint
"git config --get-color" did not parse its command line arguments carefully. * jk/colors-fix: t4026: test "normal" color config: fix parsing of "git config --get-color some.key -1" docs: describe ANSI 256-color mode
Diffstat (limited to 't')
-rwxr-xr-xt/t4026-color.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 3726a0e20..63e423838 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -53,6 +53,14 @@ test_expect_success '256 colors' '
color "254 bold 255" "[1;38;5;254;48;5;255m"
'
+test_expect_success '"normal" yields no color at all"' '
+ color "normal black" "[40m"
+'
+
+test_expect_success '-1 is a synonym for "normal"' '
+ color "-1 black" "[40m"
+'
+
test_expect_success 'color too small' '
invalid_color "-2"
'