diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:28 -0700 |
| commit | 7e25437d35a70791b345872af202eabfb3e1a8bc (patch) | |
| tree | 1d8dcdc9814e310d8be656b11d76885c37191185 /t/t7400-submodule-basic.sh | |
| parent | 00624d608cc69bd62801c93e74d1ea7a7ddd6598 (diff) | |
| parent | 984cd77ddbf0eea7371a18ad7124120473b6bb2d (diff) | |
| download | git-7e25437d35a70791b345872af202eabfb3e1a8bc.tar.gz | |
Merge branch 'sb/submodule-core-worktree'
"git submodule" did not correctly adjust core.worktree setting that
indicates whether/where a submodule repository has its associated
working tree across various state transitions, which has been
corrected.
* sb/submodule-core-worktree:
submodule deinit: unset core.worktree
submodule: ensure core.worktree is set after update
submodule: unset core.worktree if no working tree is present
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 812db137b8..48fd14fae6 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -993,6 +993,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 && |