Merge branch 'en/sparse-checkout'

[thirdparty/git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index 4fd2db532932928cba075afd4978c4074f736b9c..4dad649f94220e3897e629a5737da5f08705a5fb 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -146,15 +146,14 @@ void submodule_unset_core_worktree(const struct submodule *sub);
 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);
 
 /*
  * Return the absolute path of the working tree of the superproject, which this
  * project is a submodule of. If this repository is not a submodule of
- * another repository, return NULL.
+ * another repository, return 0.
  */
-const char *get_superproject_working_tree(void);
+int get_superproject_working_tree(struct strbuf *buf);
 
 #endif