Merge branch 'sb/submodule-move-nested'
commit0c7ecb7c311d393db41f4d81a113ffc5f3b4498f
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:17 +0000 (8 15:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:17 +0000 (8 15:59 +0900)
tree1b96e0dd82a0396aa205637d120ab1caac74fbe3
parent92034a9cd5e71cf686ef66029433bdaba75027b0
parentda62f786d2df60f3c8255cf4cbbcd9c1f9458d99
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
12 files changed:
Documentation/technical/api-submodule-config.txt
builtin/grep.c
builtin/mv.c
builtin/submodule--helper.c
dir.c
dir.h
submodule-config.c
submodule.c
submodule.h
t/helper/test-submodule-config.c
t/t7001-mv.sh
unpack-trees.c