t6044: add more testcases with staged changes before a merge is invoked

diff --git a/submodule-config.h b/submodule-config.h
index e3845831f6cbd25097ea54b3e2246faa8a32e192..17e297022396d2b2b837187d6deaf8a42d45a0d6 100644 (file)
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -22,6 +22,9 @@ struct submodule {
        int recommend_shallow;
 };
 
+#define SUBMODULE_INIT { NULL, NULL, NULL, RECURSE_SUBMODULES_NONE, \
+       NULL, NULL, SUBMODULE_UPDATE_STRATEGY_INIT, {0}, -1 };
+
 struct submodule_cache;
 struct repository;
 
@@ -45,4 +48,11 @@ extern const struct submodule *submodule_from_cache(struct repository *repo,
                                                    const char *key);
 extern void submodule_free(void);
 
+/*
+ * Returns 0 if the name is syntactically acceptable as a submodule "name"
+ * (e.g., that may be found in the subsection of a .gitmodules file) and -1
+ * otherwise.
+ */
+int check_submodule_name(const char *name);
+
 #endif /* SUBMODULE_CONFIG_H */