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>
This commit is contained in:

committed by
Junio C Hamano

parent
47e83eb3b7
commit
f6f8586140
12
dir.c
12
dir.c
@ -2773,3 +2773,15 @@ void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
|
||||
free(work_tree);
|
||||
free(git_dir);
|
||||
}
|
||||
|
||||
/*
|
||||
* Migrate the git directory of the given path from old_git_dir to new_git_dir.
|
||||
*/
|
||||
void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir)
|
||||
{
|
||||
if (rename(old_git_dir, new_git_dir) < 0)
|
||||
die_errno(_("could not migrate git directory from '%s' to '%s'"),
|
||||
old_git_dir, new_git_dir);
|
||||
|
||||
connect_work_tree_and_git_dir(path, new_git_dir);
|
||||
}
|
||||
|
Reference in New Issue
Block a user