diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2021-07-14 15:12:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-14 22:42:21 +0200 |
| commit | 47410778fbd2765c9e0a4b4026ece66aa7c83aa4 (patch) | |
| tree | b824825b3feaa0ee00f8dac09fcb352f3b8f292a /sparse-index.c | |
| parent | sparse-index: skip indexes with unmerged entries (diff) | |
| download | git-47410778fbd2765c9e0a4b4026ece66aa7c83aa4.tar.xz git-47410778fbd2765c9e0a4b4026ece66aa7c83aa4.zip | |
sparse-index: include EXTENDED flag when expanding
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 the CE_EXTENDED
flag is not included. The CE_EXTENDED flag would exist if we loaded a
full index from disk with these entries marked with CE_SKIP_WORKTREE, so
we can add the flag here to be consistent. This allows us to directly
compare the flags present in cache entries when testing the sparse-index
feature, but has no significance to its correctness in the user-facing
functionality.
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sparse-index.c')
| -rw-r--r-- | sparse-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sparse-index.c b/sparse-index.c index 2c69593027..ef53bd2198 100644 --- a/sparse-index.c +++ b/sparse-index.c @@ -213,7 +213,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); |