Merge branch 'jk/rebase-i-squash-count-fix' into maint

diff --git a/wt-status.h b/wt-status.h
index e40183770700cb593d4e4f2bf914a5b6eff0bb09..54fec77032dc9c5d0f7af4226afc886797a209c4 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -128,4 +128,10 @@ void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, .
 __attribute__((format (printf, 3, 4)))
 void status_printf(struct wt_status *s, const char *color, const char *fmt, ...);
 
+/* The following functions expect that the caller took care of reading the index. */
+int has_unstaged_changes(int ignore_submodules);
+int has_uncommitted_changes(int ignore_submodules);
+int require_clean_work_tree(const char *action, const char *hint,
+       int ignore_submodules, int gently);
+
 #endif /* STATUS_H */