Merge branch 'mk/color'

diff --git a/wt-status.h b/wt-status.h
index 0a5a5b7ba9fc1d50c7dcab8220a4fb77ffecddb4..02afaa60eee74018e074a4dcb3bec97c2e0ce9dc 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -1,6 +1,8 @@
 #ifndef STATUS_H
 #define STATUS_H
 
+#include <stdio.h>
+
 enum color_wt_status {
        WT_STATUS_HEADER,
        WT_STATUS_UPDATED,
@@ -12,13 +14,22 @@ struct wt_status {
        int is_initial;
        char *branch;
        const char *reference;
-       int commitable;
        int verbose;
        int amend;
        int untracked;
+       int nowarn;
+       /* These are computed during processing of the individual sections */
+       int commitable;
+       int workdir_dirty;
+       int workdir_untracked;
+       const char *index_file;
+       FILE *fp;
+       const char *prefix;
 };
 
 int git_status_config(const char *var, const char *value);
+int wt_status_use_color;
+int wt_status_relative_paths;
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);