Merge branch 'ds/branch-auto-rebase'

[git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index 63d50f2871f51d4363afa2f7bbb21c81186b9f44..7d61410b1733825e3bb8042781a75de3ee62c41d 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -17,6 +17,7 @@ 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;
@@ -27,8 +28,8 @@ struct wt_status {
 };
 
 int git_status_config(const char *var, const char *value);
-int wt_status_use_color;
-int wt_status_relative_paths;
+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);