diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:59:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:59:17 +0300 |
| commit | 0c7ecb7c311d393db41f4d81a113ffc5f3b4498f (patch) | |
| tree | 1b96e0dd82a0396aa205637d120ab1caac74fbe3 /builtin/mv.c | |
| parent | 92034a9cd5e71cf686ef66029433bdaba75027b0 (diff) | |
| parent | da62f786d2df60f3c8255cf4cbbcd9c1f9458d99 (diff) | |
Merge branch 'sb/submodule-move-nested'
Moving a submodule that itself has submodule in it with "git mv"
forgot to make necessary adjustment to the nested sub-submodules;
now the codepath learned to recurse into the submodules.
* sb/submodule-move-nested:
submodule: fixup nested submodules after moving the submodule
submodule-config: remove submodule_from_cache
submodule-config: add repository argument to submodule_from_{name, path}
submodule-config: allow submodule_free to handle arbitrary repositories
grep: remove "repo" arg from non-supporting funcs
submodule.h: drop declaration of connect_work_tree_and_git_dir
Diffstat (limited to 'builtin/mv.c')
| -rw-r--r-- | builtin/mv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 6d141f7a53..7a63667d64 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -276,10 +276,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix) die_errno(_("renaming '%s' failed"), src); } if (submodule_gitfile[i]) { - if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR) - connect_work_tree_and_git_dir(dst, submodule_gitfile[i]); if (!update_path_in_gitmodules(src, dst)) gitmodules_modified = 1; + if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR) + connect_work_tree_and_git_dir(dst, + submodule_gitfile[i], + 1); } if (mode == WORKING_DIRECTORY) |