diff options
| author | Stefan Beller <sbeller@google.com> | 2018-03-28 22:35:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 16:44:51 (GMT) |
| commit | da62f786d2df60f3c8255cf4cbbcd9c1f9458d99 (patch) | |
| tree | 9a0a2c11baadcabfbdd1c4044e7252a3b8862af4 /submodule.c | |
| parent | 0c89fdd739183234f86fe2be03a0374705ed93ed (diff) | |
| download | git-da62f786d2df60f3c8255cf4cbbcd9c1f9458d99.zip git-da62f786d2df60f3c8255cf4cbbcd9c1f9458d99.tar.gz git-da62f786d2df60f3c8255cf4cbbcd9c1f9458d99.tar.bz2 | |
submodule: fixup nested submodules after moving the submodule
connect_work_tree_and_git_dir is used to connect a submodule worktree with
its git directory and vice versa after events that require a reconnection
such as moving around the working tree. As submodules can have nested
submodules themselves, we'd also want to fix the nested submodules when
asked to. Add an option to recurse into the nested submodules and connect
them as well.
As submodules are identified by their name (which determines their git
directory in relation to their superproject's git directory) internally
and by their path in the working tree of the superproject, we need to
make sure that the mapping of name <-> path is kept intact. We can do
that in the git-mv command by writing out the gitmodules file first
and then forcing a reload of the submodule config machinery.
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/submodule.c b/submodule.c index dac73d1..53c45e4 100644 --- a/submodule.c +++ b/submodule.c @@ -1625,7 +1625,7 @@ int submodule_move_head(const char *path, } else { char *gitdir = xstrfmt("%s/modules/%s", get_git_common_dir(), sub->name); - connect_work_tree_and_git_dir(path, gitdir); + connect_work_tree_and_git_dir(path, gitdir, 0); free(gitdir); /* make sure the index is clean as well */ @@ -1635,7 +1635,7 @@ int submodule_move_head(const char *path, if (old && (flags & SUBMODULE_MOVE_HEAD_FORCE)) { char *gitdir = xstrfmt("%s/modules/%s", get_git_common_dir(), sub->name); - connect_work_tree_and_git_dir(path, gitdir); + connect_work_tree_and_git_dir(path, gitdir, 1); free(gitdir); } } @@ -1948,7 +1948,7 @@ void absorb_git_dir_into_superproject(const char *prefix, if (!sub) die(_("could not lookup name for submodule '%s'"), path); connect_work_tree_and_git_dir(path, - git_path("modules/%s", sub->name)); + git_path("modules/%s", sub->name), 0); } else { /* Is it already absorbed into the superprojects git dir? */ char *real_sub_git_dir = real_pathdup(sub_git_dir, 1); |