From 7cd52b5b4bf3be1f5d33fed889af186aae1ea7b8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 5 Apr 2011 00:40:23 -0500 Subject: Share color list between graph and show-branch This also adds the new colors to show-branch that were added a while back for graph output. Signed-off-by: Dan McGee Signed-off-by: Junio C Hamano --- graph.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'graph.c') diff --git a/graph.c b/graph.c index ef2e24e85a..2f6893dc4f 100644 --- a/graph.c +++ b/graph.c @@ -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; -- cgit v1.3