summaryrefslogtreecommitdiff
path: root/t/t7001-mv.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:07 (GMT)
commit9cb50a3ca60a5c5969deb83d11782da26c3bcdb7 (patch)
tree5c5454be5348508477696ae56cb01f6aa92f6467 /t/t7001-mv.sh
parente0b5851907c4feb32af3b1f96200cdd6c68b524d (diff)
parenta127331cd812336235cb95b45b7e4c52c433be7f (diff)
downloadgit-9cb50a3ca60a5c5969deb83d11782da26c3bcdb7.zip
git-9cb50a3ca60a5c5969deb83d11782da26c3bcdb7.tar.gz
git-9cb50a3ca60a5c5969deb83d11782da26c3bcdb7.tar.bz2
Merge branch 'sb/mv-submodule-fix'
"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/t7001-mv.sh')
-rwxr-xr-xt/t7001-mv.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4008fae..4a2570e 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