diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:05 -0700 |
| commit | 920f2ea33bdf06dfda272a146c6fbce2ae11bf99 (patch) | |
| tree | fc4130aacbc537752a532878ccb72d9506e164bf /t | |
| parent | Merge branch 'da/user-useconfigonly' into HEAD (diff) | |
| parent | mv: allow moving nested submodules (diff) | |
| download | tgif-920f2ea33bdf06dfda272a146c6fbce2ae11bf99.tar.xz | |
Merge branch 'sb/mv-submodule-fix' into HEAD
"git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
* sb/mv-submodule-fix:
mv: allow moving nested submodules
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 4008faead8..4a2570ed95 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -292,6 +292,9 @@ test_expect_success 'setup submodule' ' echo content >file && git add file && git commit -m "added sub and file" && + mkdir -p deep/directory/hierachy && + git submodule add ./. deep/directory/hierachy/sub && + git commit -m "added another submodule" && git branch submodule ' @@ -475,4 +478,17 @@ test_expect_success 'mv -k does not accidentally destroy submodules' ' git checkout . ' +test_expect_success 'moving a submodule in nested directories' ' + ( + cd deep && + git mv directory ../ && + # git status would fail if the update of linking git dir to + # work dir of the submodule failed. + git status && + git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual && + echo "directory/hierachy/sub" >../expect + ) && + test_cmp actual expect +' + test_done |