diff options
| author | Stefan Beller <sbeller@google.com> | 2018-06-18 17:06:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-19 09:28:13 -0700 |
| commit | 984cd77ddbf0eea7371a18ad7124120473b6bb2d (patch) | |
| tree | 4747f5bc9053244ed9884d59d2bd983bf810c543 /t/lib-submodule-update.sh | |
| parent | e98317508c02b7cc65bf5b28f27788e47096b166 (diff) | |
| download | git-984cd77ddbf0eea7371a18ad7124120473b6bb2d.tar.gz | |
submodule deinit: unset core.worktree
When a submodule is deinit'd, the working tree is gone, so the setting of
core.worktree is bogus. Unset it.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-submodule-update.sh')
| -rwxr-xr-x | t/lib-submodule-update.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index 12cd4e9233..aa5ac03325 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 - GIT_WORK_TREE=. git -C submodule_update/.git/modules/sub1/modules/sub2 config --unset core.worktree + # core.worktree is unset for sub2 as it is not checked out fi && # indicate we are interested in the submodule: git -C submodule_update config submodule.sub1.url "bogus" && |