Skip to content

Commit

Permalink
Fix sparse-checkout set crashes (#607)
Browse files Browse the repository at this point in the history
  • Loading branch information
vdye authored and dscho committed Apr 29, 2024
2 parents d45836f + a3a3c99 commit b68812e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sparse-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ void expand_index(struct index_state *istate, struct pattern_list *pl)
if (pl &&
path_matches_pattern_list(ce->name, ce->ce_namelen,
NULL, &dtype,
pl, istate) == NOT_MATCHED) {
pl, full) == NOT_MATCHED) {
set_index_entry(full, full->cache_nr++, ce);
continue;
}
Expand Down Expand Up @@ -399,6 +399,7 @@ void expand_index(struct index_state *istate, struct pattern_list *pl)
}

/* Copy back into original index. */
istate->name_hash_initialized = full->name_hash_initialized;
memcpy(&istate->name_hash, &full->name_hash, sizeof(full->name_hash));
memcpy(&istate->dir_hash, &full->dir_hash, sizeof(full->dir_hash));
istate->sparse_index = pl ? INDEX_PARTIALLY_SPARSE : INDEX_EXPANDED;
Expand Down
16 changes: 16 additions & 0 deletions t/t1092-sparse-checkout-compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,22 @@ test_expect_success 'root directory cannot be sparse' '
test_cmp expect actual
'

test_expect_success 'sparse-checkout with untracked files and dirs' '
init_repos &&
# Empty directories outside sparse cone are deleted
run_on_sparse mkdir -p deep/empty &&
test_sparse_match git sparse-checkout set folder1 &&
test_must_be_empty sparse-checkout-err &&
run_on_sparse test_path_is_missing deep &&
# Untracked files outside sparse cone are not deleted
run_on_sparse touch folder1/another &&
test_sparse_match git sparse-checkout set folder2 &&
grep "directory ${SQ}folder1/${SQ} contains untracked files" sparse-checkout-err &&
run_on_sparse test_path_exists folder1/another
'

test_expect_success 'status with options' '
init_repos &&
test_sparse_match ls &&
Expand Down

0 comments on commit b68812e

Please sign in to comment.