Skip to content

Commit

Permalink
sparse-index: silently return when not using cone-mode patterns
Browse files Browse the repository at this point in the history
This commit is necessary becaue of the previous change that turned on
the sparse-index by default. Some cases in t1091 now enable the sparse
index and hit different corner cases around cone mode patterns.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
  • Loading branch information
derrickstolee committed Jun 21, 2021
1 parent 01fc55b commit cf26b40
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions sparse-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ static int index_has_unmerged_entries(struct index_state *istate)
int convert_to_sparse(struct index_state *istate)
{
int test_env;

if (istate->split_index || istate->sparse_index ||
!core_apply_sparse_checkout || !core_sparse_checkout_cone)
return 0;
Expand Down Expand Up @@ -158,10 +159,16 @@ int convert_to_sparse(struct index_state *istate)
return 0;
}

if (!istate->sparse_checkout_patterns->use_cone_patterns) {
warning(_("attempting to use sparse-index without cone mode"));
return -1;
}
/*
* We need cone-mode patterns to use sparse-index. If a user edits
* their sparse-checkout file manually, then we can detect during
* parsing that they are not actually using cone-mode patterns and
* hence we need to abort this conversion _without error_. Warnings
* already exist in the pattern parsing to inform the user of their
* bad patterns.
*/
if (!istate->sparse_checkout_patterns->use_cone_patterns)
return 0;

/*
* NEEDSWORK: If we have unmerged entries, then stay full.
Expand Down

0 comments on commit cf26b40

Please sign in to comment.