summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-09 23:08:40 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-10 12:54:07 -0700
commit23900a964608bbfda6989a0a2cd4342f19f9194c (patch)
tree78ff57c15c79f17f248a402d3cd075afc68201c4 /wt-status.h
parentd249b098893809c6de6e5e20063a22ac2c629ce7 (diff)
downloadgit-23900a964608bbfda6989a0a2cd4342f19f9194c.tar.gz
wt-status: move wt_status_colors[] into wt_status structure
The benefit of this one alone is somewhat iffy, but for completeness this moves the wt_status_colors[] color palette to the wt_status structure to complete the libification started by the previous commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/wt-status.h b/wt-status.h
index cd06a4d955..0297fabdc1 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -3,9 +3,10 @@
#include <stdio.h>
#include "string-list.h"
+#include "color.h"
enum color_wt_status {
- WT_STATUS_HEADER,
+ WT_STATUS_HEADER = 0,
WT_STATUS_UPDATED,
WT_STATUS_CHANGED,
WT_STATUS_UNTRACKED,
@@ -37,6 +38,7 @@ struct wt_status {
int relative_paths;
int submodule_summary;
enum untracked_status_type show_untracked_files;
+ char color_palette[WT_STATUS_UNMERGED+1][COLOR_MAXLEN];
/* These are computed during processing of the individual sections */
int commitable;