wt-status: move many global settings to wt_status structure

[git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index f80142ffdecb928d7c9e3f72e0d9f9d27102118c..cd06a4d955208962de6df37cfe1ff452918d12f1 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -18,7 +18,6 @@ enum untracked_status_type {
        SHOW_NORMAL_UNTRACKED_FILES,
        SHOW_ALL_UNTRACKED_FILES
 };
-extern enum untracked_status_type show_untracked_files;
 
 struct wt_status_change_data {
        int worktree_status;
@@ -33,8 +32,12 @@ struct wt_status {
        const char *reference;
        int verbose;
        int amend;
-       int untracked;
        int nowarn;
+       int use_color;
+       int relative_paths;
+       int submodule_summary;
+       enum untracked_status_type show_untracked_files;
+
        /* These are computed during processing of the individual sections */
        int commitable;
        int workdir_dirty;
@@ -46,8 +49,6 @@ struct wt_status {
 };
 
 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);
 void wt_status_collect_changes(struct wt_status *s);