From 984cd77ddbf0eea7371a18ad7124120473b6bb2d Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 18 Jun 2018 17:06:08 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- t/lib-submodule-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/lib-submodule-update.sh') 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" && -- cgit v1.2.1