Merge branch 'lk/more-helpful-status-hints'

* lk/more-helpful-status-hints:
status: color in-progress message like other header messages

diff --git a/wt-status.c b/wt-status.c
index c749267c95bb90a512cc869760d42c4e050b3e81..c110cbc1250b08fe491d60244e1c8f27c0201532 100644 (file)
--- 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 c1066a0ec61a5ccc62aa31d53b68dec765a9770d..f8fc58cc0ac8ec73d81fba441b1899b934eaadb4 100644 (file)
--- 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
 };