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

diff --cc Documentation/technical/api-submodule-config.txt
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/mv.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc dir.c
index 63a917be45db99c278cc86012ff74718043dc63d,4f401b6a3c8d54e9619b6bfe537cdd1ec2a8c7e1..be08d3d296f6d565202fc51586f928b5e274e8a9
--- 1/dir.c
--- 2/dir.c
+++ b/dir.c
@@@ -3007,11 -2986,60 +3008,60 @@@ void untracked_cache_remove_from_index(
  void untracked_cache_add_to_index(struct index_state *istate,
                                  const char *path)
  {
 -      untracked_cache_invalidate_path(istate, path);
 +      untracked_cache_invalidate_path(istate, path, 1);
  }
  
- /* Update gitfile and core.worktree setting to connect work tree and git dir */
- void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
+ static void connect_wt_gitdir_in_nested(const char *sub_worktree,
+                                       const char *sub_gitdir)
+ {
+       int i;
+       struct repository subrepo;
+       struct strbuf sub_wt = STRBUF_INIT;
+       struct strbuf sub_gd = STRBUF_INIT;
+ 
+       const struct submodule *sub;
+ 
+       /* If the submodule has no working tree, we can ignore it. */
+       if (repo_init(&subrepo, sub_gitdir, sub_worktree))
+               return;
+ 
+       if (repo_read_index(&subrepo) < 0)
+               die("index file corrupt in repo %s", subrepo.gitdir);
+ 
+       for (i = 0; i < subrepo.index->cache_nr; i++) {
+               const struct cache_entry *ce = subrepo.index->cache[i];
+ 
+               if (!S_ISGITLINK(ce->ce_mode))
+                       continue;
+ 
+               while (i + 1 < subrepo.index->cache_nr &&
+                      !strcmp(ce->name, subrepo.index->cache[i + 1]->name))
+                       /*
+                        * Skip entries with the same name in different stages
+                        * to make sure an entry is returned only once.
+                        */
+                       i++;
+ 
+               sub = submodule_from_path(&subrepo, &null_oid, ce->name);
+               if (!sub || !is_submodule_active(&subrepo, ce->name))
+                       /* .gitmodules broken or inactive sub */
+                       continue;
+ 
+               strbuf_reset(&sub_wt);
+               strbuf_reset(&sub_gd);
+               strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path);
+               strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name);
+ 
+               connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 1);
+       }
+       strbuf_release(&sub_wt);
+       strbuf_release(&sub_gd);
+       repo_clear(&subrepo);
+ }
+ 
+ void connect_work_tree_and_git_dir(const char *work_tree_,
+                                  const char *git_dir_,
+                                  int recurse_into_nested)
  {
        struct strbuf gitfile_sb = STRBUF_INIT;
        struct strbuf cfg_sb = STRBUF_INIT;

diff --cc dir.h
Simple merge

diff --cc submodule-config.c
Simple merge

diff --cc submodule.c
index 9a50168b2375d9cac306a22c8be4559dde114d95,53c45e49d0547dd2d0b52a7af3ad35ad510d0a91..74d35b25779f4f771cc9d9ababe3a75cb04ac81c
--- 1/submodule.c
--- 2/submodule.c
+++ b/submodule.c
@@@ -1601,10 -1603,10 +1603,10 @@@ int submodule_move_head(const char *pat
        else
                error_code_ptr = NULL;
  
 -      if (old && !is_submodule_populated_gently(path, error_code_ptr))
 +      if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
                return 0;
  
-       sub = submodule_from_path(&null_oid, path);
+       sub = submodule_from_path(the_repository, &null_oid, path);
  
        if (!sub)
                die("BUG: could not get submodule information for '%s'", path);
@@@ -1630,10 -1632,10 +1632,10 @@@
                        submodule_reset_index(path);
                }
  
 -              if (old && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
 +              if (old_head && (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);
                }
        }

diff --cc submodule.h
Simple merge

diff --cc t/helper/test-submodule-config.c
Simple merge

diff --cc t/t7001-mv.sh
Simple merge

diff --cc unpack-trees.c
Simple merge