diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-10-07 18:09:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-07 09:29:31 -0700 |
| commit | d8cc92ab13e438f225770843868ae5a58c6bb357 (patch) | |
| tree | 63b17084673cc94a072919babeab9314e3b02aab /wt-status.h | |
| parent | 41a5dd6d8622a67216978131e394148c7fa58b19 (diff) | |
| download | git-d8cc92ab13e438f225770843868ae5a58c6bb357.tar.gz git-d8cc92ab13e438f225770843868ae5a58c6bb357.tar.xz | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wt-status.h b/wt-status.h index 68e367a23..54fec7703 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 */ |