summaryrefslogtreecommitdiff
path: root/t/t7400-submodule-basic.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:53 (GMT)
commit3942920966b4392c52c09f66dda391d9c330f0f7 (patch)
treed1245dc0d86064a3450d1b08beb4207cf0f8458d /t/t7400-submodule-basic.sh
parent1ed943e9ae5172088654f25b0a35c8425eee9b2f (diff)
parent8eda5efa1269a6117b86a97a309eb3a195b5f087 (diff)
downloadgit-3942920966b4392c52c09f66dda391d9c330f0f7.zip
git-3942920966b4392c52c09f66dda391d9c330f0f7.tar.gz
git-3942920966b4392c52c09f66dda391d9c330f0f7.tar.bz2
Merge branch 'sb/submodule-unset-core-worktree-when-worktree-is-lost'
The core.worktree setting in a submodule repository should not be pointing at a directory when the submodule loses its working tree (e.g. getting deinit'ed), but the code did not properly maintain this invariant. * sb/submodule-unset-core-worktree-when-worktree-is-lost: submodule deinit: unset core.worktree submodule--helper: fix BUG message in ensure_core_worktree submodule: unset core.worktree if no working tree is present submodule update: add regression test with old style setups
Diffstat (limited to 't/t7400-submodule-basic.sh')
-rwxr-xr-xt/t7400-submodule-basic.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 76a7cb0..aba2d4d 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -984,6 +984,11 @@ test_expect_success 'submodule deinit should remove the whole submodule section
rmdir init
'
+test_expect_success 'submodule deinit should unset core.worktree' '
+ test_path_is_file .git/modules/example/config &&
+ test_must_fail git config -f .git/modules/example/config core.worktree
+'
+
test_expect_success 'submodule deinit from subdirectory' '
git submodule update --init &&
git config submodule.example.foo bar &&