From: Xin Li <delphij@google.com>
To: git@vger.kernel.org
Cc: Xin Li <delphij@google.com>
Subject: [PATCH v6 3/4] sparse-checkout: upgrade repository to version 1 when enabling extension
Date: Fri, 5 Jun 2020 02:10:03 -0700 [thread overview]
Message-ID: <20200605091004.208668-4-delphij@google.com> (raw)
In-Reply-To: <20200605091004.208668-1-delphij@google.com>
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 <delphij@google.com>
---
builtin/sparse-checkout.c | 2 ++
t/t2404-worktree-config.sh | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 95d0882417..95669815d4 100644
--- 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
index 286121d8de..9536d10919 100755
--- 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' '
--
2.27.0.278.ge193c7cf3a9-goog
next prev parent reply other threads:[~2020-06-05 9:10 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 20:00 [PATCH] fetch: allow adding a filter after initial clone Xin Li
2020-05-13 20:43 ` Junio C Hamano
2020-05-13 21:41 ` Xin Li
2020-05-13 22:07 ` Junio C Hamano
2020-05-13 22:18 ` Junio C Hamano
2020-05-13 23:44 ` brian m. carlson
2020-05-28 2:53 ` [PATCH v2 0/1] " Xin Li
2020-05-28 2:54 ` [PATCH v2 1/1] " Xin Li
2020-05-28 3:28 ` Jonathan Nieder
2020-05-28 4:08 ` [PATCH v3] " Xin Li
2020-05-28 15:04 ` [PATCH v2 1/1] " Junio C Hamano
2020-05-28 17:19 ` Jonathan Nieder
2020-05-28 19:12 ` Xin Li
2020-05-28 19:17 ` Jonathan Nieder
2020-05-29 0:04 ` [PATCH v4] " Xin Li
2020-05-29 0:41 ` Junio C Hamano
2020-05-29 18:00 ` Junio C Hamano
2020-05-29 1:01 ` Jonathan Nieder
2020-05-29 6:44 ` [PATCH v5] " Xin Li
2020-05-29 6:54 ` [PATCH v4] " Xin Li
2020-05-29 18:06 ` Junio C Hamano
2020-06-05 9:10 ` [PATCH v6 0/4] " Xin Li
2020-06-05 9:10 ` [PATCH v6 1/4] repository: add a helper function to perform repository format upgrade Xin Li
2020-06-05 19:12 ` Junio C Hamano
2020-06-05 9:10 ` [PATCH v6 2/4] fetch: allow adding a filter after initial clone Xin Li
2020-06-05 19:15 ` Junio C Hamano
2020-06-05 9:10 ` Xin Li [this message]
2020-06-05 19:21 ` [PATCH v6 3/4] sparse-checkout: upgrade repository to version 1 when enabling extension Junio C Hamano
2020-06-05 9:10 ` [PATCH v6 4/4] check_repository_format_gently(): refuse extensions for old repositories Xin Li
2020-06-08 16:59 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200605091004.208668-4-delphij@google.com \
--to=delphij@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.