Merge branch 'bc/misconception-doc' into maint

[thirdparty/git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index ac206dc182a8e65d8fa066ece747593bf8b781ea..c81ec1a9b6c8ff3061c8119ad68b32f850314d9b 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -136,6 +136,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
@@ -144,8 +146,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);
 
 /*