parse_color: fix return value for numeric color values 0-8
When commit 695d95d refactored the color parsing, it missed a "return 0" when parsing literal numbers 0-8 (which represent basic ANSI colors), leading us to report these colors as an error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 20, 2015 at 17:14 UTC
3759d27aca3ddd78b4b1169a767809748dc1fc3f
2 files changed
+5
color.c
+1
@@ -112,6 +112,7 @@ static int parse_color(struct color *out, const char *name, int len)
112
} else if (val < 8) {
113
out->type = COLOR_ANSI;
114
out->value = val;
115
+ return 0;
116
} else if (val < 256) {
117
out->type = COLOR_256;
118
out->value = val;
t/t4026-color.sh
+4
@@ -60,6 +60,10 @@ test_expect_success 'absurdly long color specification' '
60
"[1;2;4;5;7;22;24;25;27;38;2;255;255;255;48;2;255;255;255m"
61
'
62
63
+test_expect_success '0-7 are aliases for basic ANSI color names' '
64
+ color "0 7" "[30;47m"
65
+'
66
+
67
test_expect_success '256 colors' '
68
color "254 bold 255" "[1;38;5;254;48;5;255m"
69
'