Commit f62ce3de authored by Linus Torvalds's avatar Linus Torvalds Committed by Junio C Hamano

Make index preloading check the whole path to the file

This uses the new thread-safe 'threaded_has_symlink_leading_path()'
function to efficiently verify that the whole path leading up to the
filename is a proper path, and does not contain symlinks.

This makes 'ce_uptodate()' a much stronger guarantee: it no longer just
guarantees that the 'lstat()' of the path would match, it also means
that we know that people haven't played games with moving directories
around and covered it up with symlinks.
Signed-off-by: default avatarLinus Torvalds <>
Signed-off-by: default avatarJunio C Hamano <>
parent b9fd2846
......@@ -34,7 +34,9 @@ static void *preload_thread(void *_data)
struct thread_data *p = _data;
struct index_state *index = p->index;
struct cache_entry **cep = index->cache + p->offset;
struct cache_def cache;
memset(&cache, 0, sizeof(cache));
nr = p->nr;
if (nr + p->offset > index->cache_nr)
nr = index->cache_nr - p->offset;
......@@ -49,6 +51,8 @@ static void *preload_thread(void *_data)
if (!ce_path_match(ce, p->pathspec))
if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
if (lstat(ce->name, &st))
if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment