Merge branch 'ks/rfc2047-one-char-at-a-time'

diff --git a/wt-status.h b/wt-status.h
index f8fc58cc0ac8ec73d81fba441b1899b934eaadb4..74208c06fd08b49041489c869d3c5f16804493da 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -69,6 +69,7 @@ struct wt_status {
        struct string_list change;
        struct string_list untracked;
        struct string_list ignored;
+       uint32_t untracked_in_ms;
 };
 
 struct wt_status_state {
@@ -79,6 +80,8 @@ struct wt_status_state {
        int rebase_interactive_in_progress;
        int cherry_pick_in_progress;
        int bisect_in_progress;
+       const char *branch;
+       const char *onto;
 };
 
 void wt_status_prepare(struct wt_status *s);
@@ -92,7 +95,5 @@ void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, .
        ;
 void status_printf(struct wt_status *s, const char *color, const char *fmt, ...)
        ;
-void status_printf_more(struct wt_status *s, const char *color, const char *fmt, ...)
-       __attribute__((format(printf, 3, 4)));
 
 #endif /* STATUS_H */