[PATCH v3 24/26] name-hash: don't add directories to name_hash
- From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Apr 12, 2021, 21:08 UTC
- Message-ID
- <5fd83dcf2747dddc04a1386b7e57a48d3d9aa49b.1618261698.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.906.v3.git.1618261697.gitgitgadget@gmail.com>
From: Derrick Stolee <dstolee@microsoft.com>
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> --- name-hash.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/name-hash.c b/name-hash.c index 4e03fac9bb12..d08deaa2c9e7 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);
-- gitgitgadget