summaryrefslogtreecommitdiff
path: root/t/t7406-submodule-update.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-03 19:25:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-02-03 19:25:18 (GMT)
commit5348021c6750bc22778705a454e4c6ad85414245 (patch)
treedf54cc57a01525617534d1d7717a53a939e80490 /t/t7406-submodule-update.sh
parent2243d229f75be41318db8798fc90399dd6dedb42 (diff)
parentec9629b3b9abc9fc9cb2a9e058bf8dccbc760433 (diff)
downloadgit-5348021c6750bc22778705a454e4c6ad85414245.zip
git-5348021c6750bc22778705a454e4c6ad85414245.tar.gz
git-5348021c6750bc22778705a454e4c6ad85414245.tar.bz2
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
Diffstat (limited to 't/t7406-submodule-update.sh')
0 files changed, 0 insertions, 0 deletions