From 3cd9d1b2f4471211a9c620d6ea8fe736745c3f5b Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 16 Jul 2012 07:39:54 -0400 Subject: [PATCH] status: color in-progress message like other header messages The "status" command recently learned to describe the in-progress operation in its long output format (e.g., rebasing, am, etc). This message gets its own slot in the color table, even though it is not configurable. As a result, if the user has set color.status.header to a non-default value, this message will not match (and cannot be made to match, as there is no config option). It is probably more sane to just color it like the rest of the text (i.e., just use color.status.header). This would not allow users to customize the color of this message independently, but they cannot do that with the current code anyway, and if somebody wants to build customizable colorization later, this patch does not make it much harder to do so. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- wt-status.c | 3 +-- wt-status.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/wt-status.c b/wt-status.c index c749267c9..c110cbc12 100644 --- a/wt-status.c +++ b/wt-status.c @@ -24,7 +24,6 @@ static char default_wt_status_colors[][COLOR_MAXLEN] = { GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */ GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */ GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */ - GIT_COLOR_NORMAL, /* WT_STATUS_IN_PROGRESS */ }; static const char *color(int slot, struct wt_status *s) @@ -931,7 +930,7 @@ static void show_bisect_in_progress(struct wt_status *s, static void wt_status_print_state(struct wt_status *s) { - const char *state_color = color(WT_STATUS_IN_PROGRESS, s); + const char *state_color = color(WT_STATUS_HEADER, s); struct wt_status_state state; struct stat st; diff --git a/wt-status.h b/wt-status.h index c1066a0ec..f8fc58cc0 100644 --- a/wt-status.h +++ b/wt-status.h @@ -15,7 +15,6 @@ enum color_wt_status { WT_STATUS_LOCAL_BRANCH, WT_STATUS_REMOTE_BRANCH, WT_STATUS_ONBRANCH, - WT_STATUS_IN_PROGRESS, WT_STATUS_MAXSLOT }; -- 2.26.2