Junio C Hamano wrote:
> "Victoria Dye via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> >> @@ -313,6 +336,19 @@ void ensure_full_index(struct index_state *istate)
>> trace2_region_leave("index", "ensure_full_index", istate->repo);
>> }
>>
>> +void ensure_correct_sparsity(struct index_state *istate)
>> +{
>> + /*
>> + * First check whether the index can be converted to sparse by attempting
>> + * to convert it with the SPARSE_INDEX_VERIFY_ALLOWED flag. If the
>> + * SPARSE_INDEX_VERIFY_ALLOWED checks indicate that the index cannot
>> + * be converted because repository settings and/or index properties
>> + * do not allow it, expand the index to full.
>> + */
>
> The logic may be OK, but the need to give this long description is a
> sign that the meaning of the value returned from the function is not
> clear from the name of the function.
>
>> + if (convert_to_sparse(istate, SPARSE_INDEX_VERIFY_ALLOWED))
>> + ensure_full_index(istate);
>
> It might make it more straight-forward to
>
> (1) drop the "if (verify)" part in convert_to_sparse(), which would
> mean that for all callers convert_to_sparse() will retain the
> same behaviour as before;
>
> (2) make a call to can_convert_to_sparse() here, and if that
> returns true, make a call to ensure_full_index(); this would
> behave identically to what this patch does when can_convert is
> false; and
>
> (3) correct the can_convert_to_sparse() function to not blow away
> the cache_tree unconditionally and recompute, so that calling
> it twice in a row will not be costly.
>
Agreed, this approach is a lot easier to follow. I went a bit overboard
trying to handle *all* possible cases where `convert_to_sparse` returns
before converting, but the primary goal of this series is updating the
behavior when config settings change. I'll include the suggested
restructuring in my next re-roll. Thanks!
