mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-tree: integrate with sparse index

Browse Source 
Enable use of sparse index in 'git read-tree'. The integration in this patch
is limited only to usage of 'read-tree' that does not need additional
functional changes for the sparse index to behave as expected (i.e., produce
the same user-facing results as a non-sparse index sparse-checkout). To
ensure no unexpected behavior occurs, the index is explicitly expanded when:

* '--no-sparse-checkout' is specified (because it disables sparse-checkout)
* '--prefix' is specified (if the prefix is inside a sparse directory, the
  prefixed tree cannot be properly traversed)
* two or more <tree-ish> arguments are specified ('twoway_merge' and
  'threeway_merge' do not yet support merging sparse directories)

Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Victoria Dye
2022-03-01 20:24:28 +00:00
committed by Junio C Hamano
parent 14bf38cfcf
commit 2c66a7c8ce
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
builtin/read-tree.c
View File

@ -160,8 +160,6 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
argc = parse_options(argc, argv, cmd_prefix, read_tree_options, argc = parse_options(argc, argv, cmd_prefix, read_tree_options,
read_tree_usage, 0); read_tree_usage, 0);
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
prefix_set = opts.prefix ? 1 : 0; prefix_set = opts.prefix ? 1 : 0;
if (1 < opts.merge + opts.reset + prefix_set) if (1 < opts.merge + opts.reset + prefix_set)
die("Which one? -m, --reset, or --prefix?"); die("Which one? -m, --reset, or --prefix?");
@ -173,6 +171,11 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
if (opts.reset) if (opts.reset)
opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED; opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
prepare_repo_settings(the_repository);
the_repository->settings.command_requires_full_index = 0;
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
/* /*
* NEEDSWORK * NEEDSWORK
* *
@ -214,6 +217,10 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
if (opts.merge && !opts.index_only) if (opts.merge && !opts.index_only)
setup_work_tree(); setup_work_tree();
/* TODO: audit sparse index behavior in unpack_trees */
if (opts.skip_sparse_checkout || opts.prefix)
ensure_full_index(&the_index);
if (opts.merge) { if (opts.merge) {
switch (stage - 1) { switch (stage - 1) {
case 0: case 0:
@ -223,11 +230,21 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
opts.fn = opts.prefix ? bind_merge : oneway_merge; opts.fn = opts.prefix ? bind_merge : oneway_merge;
break; break;
case 2: case 2:
/*
* TODO: update twoway_merge to handle edit/edit conflicts in
* sparse directories.
*/
ensure_full_index(&the_index);
opts.fn = twoway_merge; opts.fn = twoway_merge;
opts.initial_checkout = is_cache_unborn(); opts.initial_checkout = is_cache_unborn();
break; break;
case 3: case 3:
default: default:
/*
* TODO: update threeway_merge to handle edit/edit conflicts in
* sparse directories.
*/
ensure_full_index(&the_index);
opts.fn = threeway_merge; opts.fn = threeway_merge;
break; break;
} }

11
t/t1092-sparse-checkout-compatibility.sh
View File

@ -1409,6 +1409,17 @@ test_expect_success 'sparse index is not expanded: fetch/pull' '
ensure_not_expanded pull full base ensure_not_expanded pull full base
' '
test_expect_success 'sparse index is not expanded: read-tree' '
init_repos &&
ensure_not_expanded checkout -b test-branch update-folder1 &&
for MERGE_TREES in "update-folder2"
do
ensure_not_expanded read-tree -mu $MERGE_TREES &&
ensure_not_expanded reset --hard || return 1
done
'
test_expect_success 'ls-files' ' test_expect_success 'ls-files' '
init_repos && init_repos &&