From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Feb 2017 19:25:18 +0000 (-0800)
Subject: Merge branch 'sb/submodule-recursive-absorb'
X-Git-Tag: v2.12.0-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5348021c6750bc22778705a454e4c6ad85414245

Merge branch 'sb/submodule-recursive-absorb'

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
---

5348021c6750bc22778705a454e4c6ad85414245