summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <dstolee@microsoft.com>2021-04-12 21:08:15 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-14 13:47:51 -0700
commit5f116695864788d1fe45ff06bfad7a71a8d98d0a (patch)
treeaaa2db037b12ac8c8a8c00a9c425438d757ac0c3
parentrevision: ensure full index (diff)
downloadtgif-5f116695864788d1fe45ff06bfad7a71a8d98d0a.tar.xz
name-hash: don't add directories to name_hash
Sparse directory entries represent a directory that is outside the sparse-checkout definition. These are not paths to blobs, so should not be added to the name_hash table. Instead, they should be added to the directory hashtable when 'ignore_case' is true. Add a condition to avoid placing sparse directories into the name_hash hashtable. This avoids filling the table with extra entries that will never be queried. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--name-hash.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/name-hash.c b/name-hash.c
index 4e03fac9bb..d08deaa2c9 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -109,8 +109,11 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
if (ce->ce_flags & CE_HASHED)
return;
ce->ce_flags |= CE_HASHED;
- hashmap_entry_init(&ce->ent, memihash(ce->name, ce_namelen(ce)));
- hashmap_add(&istate->name_hash, &ce->ent);
+
+ if (!S_ISSPARSEDIR(ce->ce_mode)) {
+ hashmap_entry_init(&ce->ent, memihash(ce->name, ce_namelen(ce)));
+ hashmap_add(&istate->name_hash, &ce->ent);
+ }
if (ignore_case)
add_dir_entry(istate, ce);