Merge branch 'tb/maint-t9200-case-insensitive'

diff --git a/submodule.h b/submodule.h
index 594b50d51066be35d2f9dc9aa795f3ecdf131573..f2e8271fc68c3b1e78d200e2af374a77f253f1ee 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -28,6 +28,8 @@ int fetch_populated_submodules(const struct argv_array *options,
                               const char *prefix, int command_line_option,
                               int quiet);
 unsigned is_submodule_modified(const char *path, int ignore_untracked);
+int submodule_uses_gitfile(const char *path);
+int ok_to_remove_submodule(const char *path);
 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
                    const unsigned char a[20], const unsigned char b[20], int search);
 int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name,