Merge branch 'nd/preallocate-hash'

diff --git a/wt-status.h b/wt-status.h
index 236b41fd345ca3dd95ce450ac3fb3fca2b725e47..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);