X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=wt-status.h;h=236b41fd345ca3dd95ce450ac3fb3fca2b725e47;hb=5ec11ab39d11aecd731044955a7a4f7e925cdba6;hp=14aa9f7e13342f1210ead3aca658a6ed60961649;hpb=f6854cad2a7a7da0a360bd520d2a86af89a36c6c;p=git.git

diff --git a/wt-status.h b/wt-status.h
index 14aa9f7e1..236b41fd3 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -71,6 +71,16 @@ struct wt_status {
 	struct string_list ignored;
 };
 
+struct wt_status_state {
+	int merge_in_progress;
+	int am_in_progress;
+	int am_empty_patch;
+	int rebase_in_progress;
+	int rebase_interactive_in_progress;
+	int cherry_pick_in_progress;
+	int bisect_in_progress;
+};
+
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);
@@ -82,7 +92,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 */