summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-12-12 19:04:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-12 23:15:07 (GMT)
commitf6f858614003a3da794385cefdbddf00b85f7501 (patch)
treee62a35068d126bc51f6ab83651b57077ba794e29 /dir.h
parent47e83eb3b7d5410769d7f4d3930ba7fa12915680 (diff)
downloadgit-f6f858614003a3da794385cefdbddf00b85f7501.zip
git-f6f858614003a3da794385cefdbddf00b85f7501.tar.gz
git-f6f858614003a3da794385cefdbddf00b85f7501.tar.bz2
submodule: add absorb-git-dir function
When a submodule has its git dir inside the working dir, the submodule support for checkout that we plan to add in a later patch will fail. Add functionality to migrate the git directory to be absorbed into the superprojects git directory. The newly added code in this patch is structured such that other areas of Git can also make use of it. The code in the submodule--helper is a mere wrapper and option parser for the function `absorb_git_dir_into_superproject`, that takes care of embedding the submodules git directory into the superprojects git dir. That function makes use of the more abstract function for this use case `relocate_gitdir`, which can be used by e.g. the worktree code eventually to move around a git directory. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/dir.h b/dir.h
index 051674a..bf23a47 100644
--- a/dir.h
+++ b/dir.h
@@ -336,4 +336,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
void add_untracked_cache(struct index_state *istate);
void remove_untracked_cache(struct index_state *istate);
extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
+extern void relocate_gitdir(const char *path,
+ const char *old_git_dir,
+ const char *new_git_dir);
#endif