Merge branch 'jk/empty-archive' into maint

diff --git a/wt-status.h b/wt-status.h
index 09420d038016c1affd663ecd4b6501635de753a2..74208c06fd08b49041489c869d3c5f16804493da 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -80,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);