Merge branch 'maint'

diff --git a/wt-status.h b/wt-status.h
index cfea4ae68805d74b825cae6935a4a0dd5de5134d..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,
@@ -15,13 +17,19 @@ struct wt_status {
        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);