Re: [PATCH v3 02/12] sparse-index: include EXTENDED flag when expanding
flat view
From: Elijah Newren <hidden>
Date: 2021-05-18 01:33:27
On Fri, May 14, 2021 at 11:31 AM Derrick Stolee via GitGitGadget [off-list ref] wrote:
From: Derrick Stolee <redacted> When creating a full index from a sparse one, we create cache entries for every blob within a given sparse directory entry. These are correctly marked with the CE_SKIP_WORKTREE flag, but they must also be marked with the CE_EXTENDED flag to ensure that the skip-worktree bit is correctly written to disk in the case that the index is not converted back down to a sparse-index.
This seems odd to me. When sparse-index is not involved and we are just doing simple sparse checkouts, do we mark CE_SKIP_WORKTREE entries with CE_EXTENDED? I can't find any code that does so. Is it possible that the setting of CE_EXTENDED is just a workaround that happens to force the index to be written in cases where the logic is otherwise thinking it can get away without one? Or is there something I'm missing about why the CE_EXTENDED flag is actually needed here?
quoted hunk ↗ jump to hunk
Signed-off-by: Derrick Stolee <redacted> --- sparse-index.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/sparse-index.c b/sparse-index.c index 1b49898d0cb7..b2b3fbd75050 100644 --- a/sparse-index.c +++ b/sparse-index.c@@ -222,7 +222,7 @@ static int add_path_to_index(const struct object_id *oid, strbuf_addstr(base, path); ce = make_cache_entry(istate, mode, oid, base->buf, 0, 0); - ce->ce_flags |= CE_SKIP_WORKTREE; + ce->ce_flags |= CE_SKIP_WORKTREE | CE_EXTENDED; set_index_entry(istate, istate->cache_nr++, ce); strbuf_setlen(base, len); --gitgitgadget