summaryrefslogtreecommitdiff
path: root/color.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-01-20 22:14:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-20 23:56:03 (GMT)
commit3759d27aca3ddd78b4b1169a767809748dc1fc3f (patch)
tree731e77e963a86dec0dced2086c7e0c1439b827f5 /color.c
parent71b59849753589c3faa04176e875071417ceddd5 (diff)
downloadgit-3759d27aca3ddd78b4b1169a767809748dc1fc3f.zip
git-3759d27aca3ddd78b4b1169a767809748dc1fc3f.tar.gz
git-3759d27aca3ddd78b4b1169a767809748dc1fc3f.tar.bz2
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>
Diffstat (limited to 'color.c')
-rw-r--r--color.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/color.c b/color.c
index 809b359..9027352 100644
--- a/color.c
+++ b/color.c
@@ -112,6 +112,7 @@ static int parse_color(struct color *out, const char *name, int len)
} else if (val < 8) {
out->type = COLOR_ANSI;
out->value = val;
+ return 0;
} else if (val < 256) {
out->type = COLOR_256;
out->value = val;