summaryrefslogtreecommitdiff
path: root/color.c
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2011-04-05 00:40:23 -0500
committerJunio C Hamano <gitster@pobox.com>2011-04-04 23:20:39 -0700
commit7cd52b5b4bf3be1f5d33fed889af186aae1ea7b8 (patch)
treed66df4a57ed2cbf96816ae87205cb5c8283661fc /color.c
parent485cdb9bd8bd7de6c7099c1c3e9c6fca6a60fdd3 (diff)
downloadgit-7cd52b5b4bf3be1f5d33fed889af186aae1ea7b8.tar.gz
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 <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'color.c')
-rw-r--r--color.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/color.c b/color.c
index 417cf8fb28..3db214c247 100644
--- a/color.c
+++ b/color.c
@@ -3,6 +3,28 @@
int git_use_color_default = 0;
+/*
+ * The list of available column colors.
+ */
+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,
+};
+
+/* Ignore the RESET at the end when giving the size */
+const int column_colors_ansi_max = ARRAY_SIZE(column_colors_ansi) - 1;
+
static int parse_color(const char *name, int len)
{
static const char * const color_names[] = {