sparse-checkout: upgrade repository to version 1 when enabling extension

delphij · gitster · commit 98564d805938 · 2020-06-05T10:13:30.000-07:00
The 'extensions' configuration variable gets special meaning in the new
repository version, so when enabling the extension we should upgrade the
repository to version 1.

Signed-off-by: Xin Li &lt;delphij@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
@@ -249,6 +249,8 @@ static int set_config(enum sparse_checkout_mode mode)
 {
 	const char *config_path;
 
+	if (upgrade_repository_format(1) < 0)
+		die(_("unable to upgrade repository format to enable worktreeConfig"));
 	if (git_config_set_gently("extensions.worktreeConfig", "true")) {
 		error(_("failed to set extensions.worktreeConfig setting"));
 		return 1;
diff --git a/t/t2404-worktree-config.sh b/t/t2404-worktree-config.sh
@@ -23,8 +23,10 @@ test_expect_success 'config --worktree without extension' '
 '
 
 test_expect_success 'enable worktreeConfig extension' '
+	git config core.repositoryformatversion 1 &&
 	git config extensions.worktreeConfig true &&
-	test_cmp_config true extensions.worktreeConfig
+	test_cmp_config true extensions.worktreeConfig &&
+	test_cmp_config 1 core.repositoryformatversion
 '
 
 test_expect_success 'config is shared as before' '

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,8 @@ static int set_config(enum sparse_checkout_mode mode)`
`249`	`249`	`{`
`250`	`250`	`const char *config_path;`
`251`	`251`
	`252`	`+ if (upgrade_repository_format(1) < 0)`
	`253`	`+ die(_("unable to upgrade repository format to enable worktreeConfig"));`
`252`	`254`	`if (git_config_set_gently("extensions.worktreeConfig", "true")) {`
`253`	`255`	`error(_("failed to set extensions.worktreeConfig setting"));`
`254`	`256`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,10 @@ test_expect_success 'config --worktree without extension' '`
`23`	`23`	`'`
`24`	`24`
`25`	`25`	`test_expect_success 'enable worktreeConfig extension' '`
	`26`	`+ git config core.repositoryformatversion 1 &&`
`26`	`27`	`git config extensions.worktreeConfig true &&`
`27`		`- test_cmp_config true extensions.worktreeConfig`
	`28`	`+ test_cmp_config true extensions.worktreeConfig &&`
	`29`	`+ test_cmp_config 1 core.repositoryformatversion`
`28`	`30`	`'`
`29`	`31`
`30`	`32`	`test_expect_success 'config is shared as before' '`