[PATCH v3 6/6] worktree: copy sparse-checkout patterns and config on add
- From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Dec 28, 2021, 21:32 UTC
- Message-ID
- <fcece09546cbdb5f1bcd0d0c5aaa3a54e9d3b852.1640727143.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1101.v3.git.1640727143.gitgitgadget@gmail.com>
From: Derrick Stolee <dstolee@microsoft.com>
When adding a new worktree, it is reasonable to expect that we want to use the current set of sparse-checkout settings for that new worktree. This is particularly important for repositories where the worktree would become too large to be useful. This is even more important when using partial clone as well, since we want to avoid downloading the missing blobs for files that should not be written to the new worktree.
The only way to create such a worktree without this intermediate step of expanding the full worktree is to copy the sparse-checkout patterns and config settings during 'git worktree add'. Each worktree has its own sparse-checkout patterns, and the default behavior when the sparse-checkout file is missing is to include all paths at HEAD. Thus, we need to have patterns from somewhere, they might as well be the current worktree's patterns. These are then modified independently in the future.
In addition to the sparse-checkout file, copy the worktree config file if worktree config is enabled and the file exists. This will copy over any important settings to ensure the new worktree behaves the same as the current one.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com> --- builtin/worktree.c | 41 +++++++++++++++++++++++ t/t1091-sparse-checkout-builtin.sh | 53 ++++++++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c index 937ee6fc38b..bca49a55f13 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -336,6 +336,47 @@ static int add_worktree(const char *path, const char *refname, strbuf_addf(&sb, "%s/commondir", sb_repo.buf); write_file(sb.buf, "../.."); + /* + * If the current worktree has sparse-checkout enabled, then copy + * the sparse-checkout patterns from the current worktree. + */ + if (core_apply_sparse_checkout) { + char *from_file = git_pathdup("info/sparse-checkout"); + char *to_file = xstrfmt("%s/worktrees/%s/info/sparse-checkout", + realpath.buf, name); + + if (file_exists(from_file)) { + if (safe_create_leading_directories(to_file) || + copy_file(to_file, from_file, 0666)) + error(_("failed to copy '%s' to '%s'; sparse-checkout may not work correctly"), + from_file, to_file); + } + + free(from_file); + free(to_file); + } + + /* + * If we are using worktree config, then copy all currenct config + * values from the current worktree into the new one, that way the + * new worktree behaves the same as this one. + */ + if (repository_format_worktree_config) { + char *from_file = git_pathdup("config.worktree"); + char *to_file = xstrfmt("%s/worktrees/%s/config.worktree", + realpath.buf, name); + + if (file_exists(from_file)) { + if (safe_create_leading_directories(to_file) || + copy_file(to_file, from_file, 0666)) + error(_("failed to copy worktree config from '%s' to '%s'"), + from_file, to_file); + } + + free(from_file); + free(to_file); + } + strvec_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf); strvec_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path); cp.git_cmd = 1; diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index 15403158c49..ce84819e1f5 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -180,6 +180,53 @@ test_expect_success 'set enables config' ' ' test_expect_success 'set enables worktree config, if enabled' ' + git init worktree-patterns && + ( + cd worktree-patterns && + test_commit test file && + mkdir dir dir2 && + test_commit dir dir/file && + test_commit dir2 dir2/file && + + # By initializing the worktree config here... + git worktree init-worktree-config && + + # This set command places config values in worktree- + # specific config... + git sparse-checkout set --cone dir && + + # Which must be copied, along with the sparse-checkout + # patterns, here. + git worktree add --detach ../worktree-patterns2 + ) && + test_cmp_config -C worktree-patterns true core.sparseCheckout && + test_cmp_config -C worktree-patterns2 true core.sparseCheckout && + test_cmp_config -C worktree-patterns true core.sparseCheckoutCone && + test_cmp_config -C worktree-patterns2 true core.sparseCheckoutCone && + test_cmp worktree-patterns/.git/info/sparse-checkout \ + worktree-patterns/.git/worktrees/worktree-patterns2/info/sparse-checkout && + + ls worktree-patterns >expect && + ls worktree-patterns2 >actual && + test_cmp expect actual && + + # Double check that the copy works from a non-main worktree. + ( + cd worktree-patterns2 && + git sparse-checkout set dir2 && + git worktree add --detach ../worktree-patterns3 + ) && + test_cmp_config -C worktree-patterns3 true core.sparseCheckout && + test_cmp_config -C worktree-patterns3 true core.sparseCheckoutCone && + test_cmp worktree-patterns/.git/worktrees/worktree-patterns2/info/sparse-checkout \ + worktree-patterns/.git/worktrees/worktree-patterns3/info/sparse-checkout && + + ls worktree-patterns2 >expect && + ls worktree-patterns3 >actual && + test_cmp expect actual +' + +test_expect_success 'worktree add copies sparse-checkout patterns' ' git init worktree-config && ( cd worktree-config && @@ -547,11 +594,11 @@ test_expect_success 'interaction with submodules' ' test_expect_success 'different sparse-checkouts with worktrees' ' git -C repo worktree add --detach ../worktree && - check_files worktree "a deep folder1 folder2" && + check_files worktree "a folder1" && git -C worktree sparse-checkout init --cone && - git -C repo sparse-checkout set folder1 && + git -C repo sparse-checkout set folder1 folder2 && git -C worktree sparse-checkout set deep/deeper1 && - check_files repo a folder1 && + check_files repo a folder1 folder2 && check_files worktree a deep '
-- gitgitgadget