Merge branch 'mg/timestamp-t-fix'

diff --git a/submodule.h b/submodule.h
index 5f26b54049f63e2536c8fe4d11453e422ac29deb..6b52133c88b2306e77fe6f759507b38c0ec0d6ce 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -40,16 +40,11 @@ extern int remove_path_from_gitmodules(const char *path);
 extern void stage_updated_gitmodules(void);
 extern void set_diffopt_flags_from_submodule_config(struct diff_options *,
                const char *path);
-extern int submodule_config(const char *var, const char *value, void *cb);
 extern int git_default_submodule_config(const char *var, const char *value, void *cb);
 
 struct option;
 int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
                                                     const char *arg, int unset);
-void load_submodule_cache(void);
-extern void gitmodules_config(void);
-extern void repo_read_gitmodules(struct repository *repo);
-extern void gitmodules_config_oid(const struct object_id *commit_oid);
 extern int is_submodule_active(struct repository *repo, const char *path);
 /*
  * Determine if a submodule has been populated at a given 'path' by checking if
@@ -62,6 +57,7 @@ extern void die_in_unpopulated_submodule(const struct index_state *istate,
                                         const char *prefix);
 extern void die_path_inside_submodule(const struct index_state *istate,
                                      const struct pathspec *ps);
+extern enum submodule_update_type parse_submodule_update_type(const char *value);
 extern int parse_submodule_update_strategy(const char *value,
                struct submodule_update_strategy *dst);
 extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);