Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter

diff --git a/wt-status.h b/wt-status.h
index 892a86c76abe69ce69327a10a5d491cc47f8e82b..78add09bd67c727babb61cd1eaa773bcd0c6e55e 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -1,25 +1,43 @@
 #ifndef STATUS_H
 #define STATUS_H
 
+#include <stdio.h>
+
 enum color_wt_status {
        WT_STATUS_HEADER,
        WT_STATUS_UPDATED,
        WT_STATUS_CHANGED,
        WT_STATUS_UNTRACKED,
+       WT_STATUS_NOBRANCH,
+};
+
+enum untracked_status_type {
+       SHOW_NO_UNTRACKED_FILES,
+       SHOW_NORMAL_UNTRACKED_FILES,
+       SHOW_ALL_UNTRACKED_FILES
 };
+extern enum untracked_status_type show_untracked_files;
 
 struct wt_status {
        int is_initial;
        char *branch;
        const char *reference;
-       int commitable;
        int verbose;
        int amend;
        int untracked;
-       int workdir_clean;
+       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 git_status_config(const char *var, const char *value, void *cb);
+extern int wt_status_use_color;
+extern int wt_status_relative_paths;
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);