From: Junio C Hamano Date: Mon, 27 Feb 2017 21:57:15 +0000 (-0800) Subject: Merge branch 'jh/preload-index-skip-skip' X-Git-Tag: v2.13.0-rc0~165 X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/c7e234fc380747b7be979bcebd4eece7601f6bfe?hp=466be3e1dedc2725a436b128469b454ad8f1f578 Merge branch 'jh/preload-index-skip-skip' The preload-index code has been taught not to bother with the index entries that are paths that are not checked out by "sparse checkout". * jh/preload-index-skip-skip: preload-index: avoid lstat for skip-worktree items --- diff --git a/preload-index.c b/preload-index.c index c1fe3a3ef9..70a4c80878 100644 --- a/preload-index.c +++ b/preload-index.c @@ -53,6 +53,8 @@ static void *preload_thread(void *_data) continue; if (ce_uptodate(ce)) continue; + if (ce_skip_worktree(ce)) + continue; if (!ce_path_match(ce, &p->pathspec, NULL)) continue; if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))