development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/colors'

Browse source 
* jk/colors:
  parse_color: fix return value for numeric color values 0-8
This commit is contained in:
Junio C Hamano 2015-01-20 15:57:22 -08:00
parent a94655dcfe 3759d27aca
commit d06ce4a508
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
color.c
View file

@ -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;

4
t/t4026-color.sh
View file

@ -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"
'