diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-20 15:57:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-20 15:57:22 -0800 |
| commit | d06ce4a508386230e9412e68264a744392795dcb (patch) | |
| tree | f0b6b3a042480e1c81eb72a0a5b1d8226fb590df | |
| parent | git-svn: make it play nicely with submodules (diff) | |
| parent | parse_color: fix return value for numeric color values 0-8 (diff) | |
| download | tgif-d06ce4a508386230e9412e68264a744392795dcb.tar.xz | |
Merge branch 'jk/colors'
* jk/colors:
parse_color: fix return value for numeric color values 0-8
| -rw-r--r-- | color.c | 1 | ||||
| -rwxr-xr-x | t/t4026-color.sh | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -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; diff --git a/t/t4026-color.sh b/t/t4026-color.sh index 267c43bd95..4d20feacfe 100755 --- a/t/t4026-color.sh +++ b/t/t4026-color.sh @@ -60,6 +60,10 @@ test_expect_success 'absurdly long color specification' ' "[1;2;4;5;7;22;24;25;27;38;2;255;255;255;48;2;255;255;255m" ' +test_expect_success '0-7 are aliases for basic ANSI color names' ' + color "0 7" "[30;47m" +' + test_expect_success '256 colors' ' color "254 bold 255" "[1;38;5;254;48;5;255m" ' |