diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:55:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:55:34 -0700 |
| commit | eab69dc449c002379dab26f0f8e2472fbf794c0b (patch) | |
| tree | 3af378bcadcb05ecb180a4a88b1151525fbbda1f | |
| parent | 0958a24d7360759902f802744c0839c8029659d7 (diff) | |
| parent | 3cd9d1b2f4471211a9c620d6ea8fe736745c3f5b (diff) | |
| download | git-eab69dc449c002379dab26f0f8e2472fbf794c0b.tar.gz git-eab69dc449c002379dab26f0f8e2472fbf794c0b.tar.xz | |
Merge branch 'lk/more-helpful-status-hints'
* lk/more-helpful-status-hints:
status: color in-progress message like other header messages
| -rw-r--r-- | wt-status.c | 3 | ||||
| -rw-r--r-- | wt-status.h | 1 |
2 files changed, 1 insertions, 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 }; |