cache-tree: integrate with sparse directory entries
The cache-tree extension was previously disabled with sparse indexes. However, the cache-tree is an important performance feature for commands like 'git status' and 'git add'. Integrate it with sparse directory entries. When writing a sparse index, completely clear and recalculate the cache tree. By starting from scratch, the only integration necessary is to check if we hit a sparse directory entry and create a leaf of the cache-tree that has an entry_count of one and no subtrees. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
dcc5fd5fd2
commit
2de37c536d
18
cache-tree.c
18
cache-tree.c
@ -256,6 +256,24 @@ static int update_one(struct cache_tree *it,
|
||||
|
||||
*skip_count = 0;
|
||||
|
||||
/*
|
||||
* If the first entry of this region is a sparse directory
|
||||
* entry corresponding exactly to 'base', then this cache_tree
|
||||
* struct is a "leaf" in the data structure, pointing to the
|
||||
* tree OID specified in the entry.
|
||||
*/
|
||||
if (entries > 0) {
|
||||
const struct cache_entry *ce = cache[0];
|
||||
|
||||
if (S_ISSPARSEDIR(ce->ce_mode) &&
|
||||
ce->ce_namelen == baselen &&
|
||||
!strncmp(ce->name, base, baselen)) {
|
||||
it->entry_count = 1;
|
||||
oidcpy(&it->oid, &ce->oid);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (0 <= it->entry_count && has_object_file(&it->oid))
|
||||
return it->entry_count;
|
||||
|
||||
|
Reference in New Issue
Block a user