From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jul 2012 19:55:33 +0000 (-0700)
Subject: Merge branch 'lk/more-helpful-status-hints'
X-Git-Tag: v1.7.12-rc0~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eab69dc449c002379dab26f0f8e2472fbf794c0b?hp=0958a24d7360759902f802744c0839c8029659d7

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 c749267c95..c110cbc125 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 c1066a0ec6..f8fc58cc0a 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
 };