diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-10 10:38:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-10 10:38:58 -0700 |
| commit | f38a45b9abec78ac04022c9ba043e78eb2d036e2 (patch) | |
| tree | 6d286bed7edb3a118d7f4d193e54406a68c213b0 /t | |
| parent | Merge branch 'mk/http-backend-content-length' (diff) | |
| parent | Revert "Merge branch 'sb/submodule-core-worktree'" (diff) | |
| download | tgif-f38a45b9abec78ac04022c9ba043e78eb2d036e2.tar.xz | |
Merge branch 'jn/submodule-core-worktree-revert'
* jn/submodule-core-worktree-revert:
Revert "Merge branch 'sb/submodule-core-worktree'"
Diffstat (limited to 't')
| -rwxr-xr-x | t/lib-submodule-update.sh | 5 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index 5b56b23166..016391723c 100755 --- a/t/lib-submodule-update.sh +++ b/t/lib-submodule-update.sh @@ -235,7 +235,7 @@ reset_work_tree_to_interested () { then mkdir -p submodule_update/.git/modules/sub1/modules && cp -r submodule_update_repo/.git/modules/sub1/modules/sub2 submodule_update/.git/modules/sub1/modules/sub2 - # core.worktree is unset for sub2 as it is not checked out + GIT_WORK_TREE=. git -C submodule_update/.git/modules/sub1/modules/sub2 config --unset core.worktree fi && # indicate we are interested in the submodule: git -C submodule_update config submodule.sub1.url "bogus" && @@ -709,8 +709,7 @@ test_submodule_recursing_with_args_common() { git branch -t remove_sub1 origin/remove_sub1 && $command remove_sub1 && test_superproject_content origin/remove_sub1 && - ! test -e sub1 && - test_must_fail git config -f .git/modules/sub1/config core.worktree + ! test -e sub1 ) ' # ... absorbing a .git directory along the way. diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 7d3d984210..c0ffc1022a 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -984,11 +984,6 @@ 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 && |