Merge branch 'sg/split-index-racefix' into maint

diff --git a/submodule.h b/submodule.h
index c98cd983e1e13d15605bb0a30d2a558fa08226bf..e452919aa467413107ea749fe90b17e4e3e198c4 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -1,11 +1,17 @@
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 
-struct repository;
-struct diff_options;
 struct argv_array;
+struct cache_entry;
+struct diff_options;
+struct index_state;
+struct object_id;
 struct oid_array;
+struct pathspec;
 struct remote;
+struct repository;
+struct string_list;
+struct strbuf;
 
 enum {
        RECURSE_SUBMODULES_ONLY = -5,
@@ -121,8 +127,6 @@ int submodule_move_head(const char *path,
                        const char *new_head,
                        unsigned flags);
 
-void submodule_unset_core_worktree(const struct submodule *sub);
-
 /*
  * Prepare the "env_array" parameter of a "struct child_process" for executing
  * a submodule by clearing any repo-specific environment variables, but