diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:41 -0700 |
| commit | 29dba37f1f3d7d692b3994ccda4a5ea705c7f252 (patch) | |
| tree | deec7c8f7d7062e1e54fc2c8acf9f083bc9063ed /builtin | |
| parent | Merge branch 'jk/stash-loosen-safety' (diff) | |
| parent | Share color list between graph and show-branch (diff) | |
| download | tgif-29dba37f1f3d7d692b3994ccda4a5ea705c7f252.tar.xz | |
Merge branch 'dm/color-palette'
* dm/color-palette:
Share color list between graph and show-branch
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/show-branch.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index da695815e2..1abcd9e02e 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -12,16 +12,6 @@ static const char* show_branch_usage[] = { }; static int showbranch_use_color = -1; -static char column_colors[][COLOR_MAXLEN] = { - GIT_COLOR_RED, - GIT_COLOR_GREEN, - GIT_COLOR_YELLOW, - GIT_COLOR_BLUE, - GIT_COLOR_MAGENTA, - GIT_COLOR_CYAN, -}; - -#define COLUMN_COLORS_MAX (ARRAY_SIZE(column_colors)) static int default_num; static int default_alloc; @@ -37,7 +27,7 @@ static const char **default_arg; static const char *get_color_code(int idx) { if (showbranch_use_color) - return column_colors[idx]; + return column_colors_ansi[idx % column_colors_ansi_max]; return ""; } @@ -892,7 +882,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) for (j = 0; j < i; j++) putchar(' '); printf("%s%c%s [%s] ", - get_color_code(i % COLUMN_COLORS_MAX), + get_color_code(i), is_head ? '*' : '!', get_color_reset_code(), ref_name[i]); } @@ -954,7 +944,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) else mark = '+'; printf("%s%c%s", - get_color_code(i % COLUMN_COLORS_MAX), + get_color_code(i), mark, get_color_reset_code()); } putchar(' '); |