summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-27 13:57:15 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-27 13:57:15 -0800
commitc7e234fc380747b7be979bcebd4eece7601f6bfe (patch)
tree5991da11bf873439ed59529b8362bdd799695483
parent466be3e1dedc2725a436b128469b454ad8f1f578 (diff)
parente596acc23a8c92784349da613502626d758215b2 (diff)
downloadgit-c7e234fc380747b7be979bcebd4eece7601f6bfe.tar.gz
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
-rw-r--r--preload-index.c2
1 files changed, 2 insertions, 0 deletions
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)))