[PATCH 07/10] submodule deinit: support multiple worktrees

From

Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

Date

Jan 16, 2019, 10:31 UTC

Message-ID

<20190116103159.9305-8-pclouds@gmail.com>

In-Reply-To

<20190116103159.9305-1-pclouds@gmail.com>

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/submodule--helper.c    |  8 ++++++--
 t/t2405-worktree-submodules.sh | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 288858af83..8943127ae7 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1097,6 +1097,8 @@ static void deinit_submodule(const char *path, const char *prefix,
 	struct strbuf sb_config = STRBUF_INIT;
 	char *sub_git_dir = xstrfmt("%s/.git", path);
 
+	check_multi_worktree_support();
+
 	sub = submodule_from_path(the_repository, &null_oid, path);
 
 	if (!sub || !sub->name)
@@ -1150,21 +1152,23 @@ static void deinit_submodule(const char *path, const char *prefix,
 		      displaypath);
 
 	cp_config.git_cmd = 1;
-	argv_array_pushl(&cp_config.args, "config", "--get-regexp", NULL);
+	argv_array_pushl(&cp_config.args, "config", "--worktree", "--get-regexp", NULL);
 	argv_array_pushf(&cp_config.args, "submodule.%s\\.", sub->name);
 
 	/* remove the .git/config entries (unless the user already did it) */
 	if (!capture_command(&cp_config, &sb_config, 0) && sb_config.len) {
+		char *config_file = get_worktree_config(the_repository);
 		char *sub_key = xstrfmt("submodule.%s", sub->name);
 		/*
 		 * remove the whole section so we have a clean state when
 		 * the user later decides to init this submodule again
 		 */
-		git_config_rename_section_in_file(NULL, sub_key, NULL);
+		git_config_rename_section_in_file(config_file, sub_key, NULL);
 		if (!(flags & OPT_QUIET))
 			printf(_("Submodule '%s' (%s) unregistered for path '%s'\n"),
 				 sub->name, sub->url, displaypath);
 		free(sub_key);
+		free(config_file);
 	}
 
 cleanup:
diff --git a/t/t2405-worktree-submodules.sh b/t/t2405-worktree-submodules.sh
index 55daace672..8d53f639c9 100755
--- a/t/t2405-worktree-submodules.sh
+++ b/t/t2405-worktree-submodules.sh
@@ -111,4 +111,15 @@ test_expect_success 'reset sync submodules' '
 	git -C secondary submodule sync
 '
 
+test_expect_success 'deinit submodules' '
+	git submodule deinit sub1 &&
+	git -C secondary submodule deinit sub2 &&
+	git config --get-regexp "submodule.*" | sort >actual1 &&
+	test_must_be_empty actual1 &&
+	test -d .git/modules/sub1 &&
+	git -C secondary config --get-regexp "submodule.*" | sort >actual2 &&
+	test_must_be_empty actual2 &&
+	test -d .git/worktrees/secondary/modules/sub2
+'
+
 test_done

-- 
2.20.0.482.g66447595a7