mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
read-cache: remove bogus shortcut
has_dir_name() has some optimizations for the case where entries are added to an index in the correct order. They kick in if the new entry sorts after the last one. One of them exits early if the last entry has a longer name than the directory of the new entry. Here's its comment: /* * The directory prefix lines up with part of * a longer file or directory name, but sorts * after it, so this sub-directory cannot * collide with a file. * * last: xxx/yy-file (because '-' sorts before '/') * this: xxx/yy/abc */ However, a file named xxx/yy would be sorted before xxx/yy-file because '-' sorts after NUL, so the length check against the last entry is not sufficient to rule out a collision. Remove it. Reported-by: SZEDER Gábor <szeder.dev@gmail.com> Suggested-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
af6b65d45e
commit
a98f7fb366
14
read-cache.c
14
read-cache.c
|
@ -1171,20 +1171,6 @@ static int has_dir_name(struct index_state *istate,
|
|||
return retval;
|
||||
}
|
||||
|
||||
if (istate->cache_nr > 0 &&
|
||||
ce_namelen(istate->cache[istate->cache_nr - 1]) > len) {
|
||||
/*
|
||||
* The directory prefix lines up with part of
|
||||
* a longer file or directory name, but sorts
|
||||
* after it, so this sub-directory cannot
|
||||
* collide with a file.
|
||||
*
|
||||
* last: xxx/yy-file (because '-' sorts before '/')
|
||||
* this: xxx/yy/abc
|
||||
*/
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*
|
||||
* This is a possible collision. Fall through and
|
||||
* let the regular search code handle it.
|
||||
|
|
Loading…
Reference in a new issue