Merge branch 'nd/pack-struct-commit'

diff --git a/submodule-config.h b/submodule-config.h
index 43dfe7dec0b6582705b525b0628344e89b76e945..21273f56a37794ae5116761e85d5264acc9f81d1 100644 (file)
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -45,9 +45,13 @@ const struct submodule *submodule_from_name(struct repository *r,
 const struct submodule *submodule_from_path(struct repository *r,
                                            const struct object_id *commit_or_tree,
                                            const char *path);
-extern const struct submodule *submodule_from_cache(struct repository *repo,
-                                                   const struct object_id *treeish_name,
-                                                   const char *key);
 void submodule_free(struct repository *r);
 
+/*
+ * 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 */