summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2013-12-04 23:19:59 +0100
committerJunio C Hamano <gitster@pobox.com>2013-12-06 12:56:12 -0800
commit5f3eb7674082a52dea6c6252752509b05a3bfe0a (patch)
treeec0f2b95958699a94a2375f8c9c5493ea6d09260 /submodule.h
parent8ea31d279681533c0b4c8eb1d61b18e95da55df0 (diff)
downloadgit-hv/submodule-ignore-fix.tar.gz
disable complete ignorance of submodules for index <-> HEAD diffhv/submodule-ignore-fix
If the value of ignore for submodules is set to "all" we would not show whats actually committed during status or diff. This can result in the user committing unexpected submodule references. Lets be nicer and always show whats in the index. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h
index c20bb6f862..e067580b57 100644
--- a/submodule.h
+++ b/submodule.h
@@ -21,6 +21,7 @@ int is_ignored_submodule(const char *path);
int submodule_config(const char *var, const char *value, void *cb);
void gitmodules_config(void);
int parse_submodule_config_option(const char *var, const char *value);
+void enforce_no_complete_ignore_submodule(struct diff_options *diffopt);
void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
void show_submodule_summary(FILE *f, const char *path,