diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:18 -0800 |
| commit | 5348021c6750bc22778705a454e4c6ad85414245 (patch) | |
| tree | df54cc57a01525617534d1d7717a53a939e80490 /t/t9114-git-svn-dcommit-merge.sh | |
| parent | 2243d229f75be41318db8798fc90399dd6dedb42 (diff) | |
| parent | ec9629b3b9abc9fc9cb2a9e058bf8dccbc760433 (diff) | |
| download | git-5348021c6750bc22778705a454e4c6ad85414245.tar.gz git-5348021c6750bc22778705a454e4c6ad85414245.tar.xz | |
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/t9114-git-svn-dcommit-merge.sh')
0 files changed, 0 insertions, 0 deletions