Merge branch 'ab/hash-object-doc'

diff --git a/submodule.h b/submodule.h
index a680214c01a5fda90a21af547389f6333388683c..8072e6d6ddfd847ca8f739e9d8af9b815c43e21d 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -131,6 +131,8 @@ 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
@@ -139,8 +141,7 @@ int submodule_move_head(const char *path,
 void prepare_submodule_repo_env(struct argv_array *out);
 
 #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
-void absorb_git_dir_into_superproject(const char *prefix,
-                                     const char *path,
+void absorb_git_dir_into_superproject(const char *path,
                                      unsigned flags);
 
 /*