mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Share color list between graph and show-branch

Browse Source 
This also adds the new colors to show-branch that were added a while
back for graph output.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dan McGee
2011-04-05 00:40:23 -05:00
committed by Junio C Hamano
parent 485cdb9bd8
commit 7cd52b5b4b
4 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
graph.c
View File

@ -59,27 +59,6 @@ enum graph_state {
GRAPH_COLLAPSING
};
/*
* The list of available column colors.
*/
static const char *column_colors_ansi[] = {
GIT_COLOR_RED,
GIT_COLOR_GREEN,
GIT_COLOR_YELLOW,
GIT_COLOR_BLUE,
GIT_COLOR_MAGENTA,
GIT_COLOR_CYAN,
GIT_COLOR_BOLD_RED,
GIT_COLOR_BOLD_GREEN,
GIT_COLOR_BOLD_YELLOW,
GIT_COLOR_BOLD_BLUE,
GIT_COLOR_BOLD_MAGENTA,
GIT_COLOR_BOLD_CYAN,
GIT_COLOR_RESET,
};
#define COLUMN_COLORS_ANSI_MAX (ARRAY_SIZE(column_colors_ansi) - 1)
static const char **column_colors;
static unsigned short column_colors_max;
@ -228,7 +207,7 @@ struct git_graph *graph_init(struct rev_info *opt)
if (!column_colors)
graph_set_column_colors(column_colors_ansi,
COLUMN_COLORS_ANSI_MAX);
column_colors_ansi_max);
graph->commit = NULL;
graph->revs = opt;