builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value

[git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index 225fb4d53561f4f1d6ad43fd990dda1c6da956f0..597c7ea988634409f920c86008f5ba70910722f9 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -8,6 +8,7 @@ enum color_wt_status {
        WT_STATUS_UPDATED,
        WT_STATUS_CHANGED,
        WT_STATUS_UNTRACKED,
+       WT_STATUS_NOBRANCH,
 };
 
 struct wt_status {
@@ -17,6 +18,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;
@@ -26,8 +28,9 @@ struct wt_status {
        const char *prefix;
 };
 
-int git_status_config(const char *var, const char *value);
-int wt_status_use_color;
+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);