From d8cc92ab13e438f225770843868ae5a58c6bb357 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 7 Oct 2016 18:09:00 +0200 Subject: wt-status: teach has_{unstaged,uncommitted}_changes() about submodules Sometimes we are *actually* interested in those changes... For example when an interactive rebase wants to continue with a staged submodule update. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- wt-status.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'wt-status.h') diff --git a/wt-status.h b/wt-status.h index 68e367a235..54fec77032 100644 --- a/wt-status.h +++ b/wt-status.h @@ -129,8 +129,9 @@ __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(void); -int has_uncommitted_changes(void); -int require_clean_work_tree(const char *action, const char *hint, int gently); +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 */ -- cgit v1.2.3