Re: [PATCH v5 02/14] sparse-index: include EXTENDED flag when expanding
flat view
From: Elijah Newren <hidden>
Date: 2021-06-08 19:00:45
On Mon, Jun 7, 2021 at 5:34 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.
In our previous discussion on this patch from v3 (https://lore.kernel.org/git/cb9161ca-dc6e-b77b-1a41-385ed8920bb2@gmail.com/ (local)), you said you'd explain the reason for this change in a bit more detail, but the commit message has not changed. Could this be corrected?
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