| commit | 5348021c6750bc22778705a454e4c6ad85414245 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Feb 2017 19:25:18 +0000 (3 11:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Feb 2017 19:25:18 +0000 (3 11:25 -0800) | ||
| tree | df54cc57a01525617534d1d7717a53a939e80490 | treesnapshot (tar.gz zip) |
| parent | 2243d229f75be41318db8798fc90399dd6dedb42 | commitdiff |
| parent | ec9629b3b9abc9fc9cb2a9e058bf8dccbc760433 | commitdiff |
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
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
| cache.h | diff1 | diff2 | blobhistory |