undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint

Browse Source 
* bd/maint-unpack-trees-parawalk-fix:
  unpack-trees: Make index lookahead less pessimal
This commit is contained in:
Junio C Hamano 2010-06-28 16:18:02 -07:00
commit 54dc783766
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unpack-trees.c
View File

@ -520,9 +520,17 @@ static int find_cache_pos(struct traverse_info *info,
const char *ce_name, *ce_slash; const char *ce_name, *ce_slash;
int cmp, ce_len; int cmp, ce_len;
if (!ce_in_traverse_path(ce, info)) if (ce->ce_flags & CE_UNPACKED) {
/*
* cache_bottom entry is already unpacked, so
* we can never match it; don't check it
* again.
*/
if (pos == o->cache_bottom)
++o->cache_bottom;
continue; continue;
if (ce->ce_flags & CE_UNPACKED) }
if (!ce_in_traverse_path(ce, info))
continue; continue;
ce_name = ce->name + pfxlen; ce_name = ce->name + pfxlen;
ce_slash = strchr(ce_name, '/'); ce_slash = strchr(ce_name, '/');