Merge branch 'sb/submodule-recursive-absorb'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Feb 2017 19:25:18 +0000 (11:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Feb 2017 19:25:18 +0000 (11:25 -0800)
When a submodule "A", which has another submodule "B" nested within
it, is "absorbed" into the top-level superproject, the inner
submodule "B" used to be left in a strange state. The logic to
adjust the .git pointers in these submodules has been corrected.

* sb/submodule-recursive-absorb:
submodule absorbing: fix worktree/gitdir pointers recursively for non-moves
cache.h: expose the dying procedure for reading gitlinks
setup: add gentle version of resolve_git_dir

1  2 
cache.h
diff --cc cache.h
Simple merge