diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-02 08:59:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-03 14:10:24 -0700 |
| commit | d8e47e7d5c62e46c517cd56737f8fcb55ccf4c8f (patch) | |
| tree | f526443cf3c44dbcf36048ad9f83190fc796528e /preload-index.c | |
| parent | dd1a234eeb36eb853982ff3fe57b7c6752dd55c6 (diff) | |
| download | git-sb/pathspec-label.tar.gz | |
pathspec: disable preload-index when attribute pathspec magic is in usesb/pathspec-label
The recent addition of the pathspec magic that requires a path to
have certain attributes set is not yet compatible with the preload
index codepath (e.g. "git status ':(attr:VAR=VAL)'") because the
attribute subsystem is not thread-ready.
For now, disable preload-index when such a pathspec magic is in use,
until the attribute subsystem learns how to better cope with
threading, to ease the development of the parts of the system that
want to utilize the pathspec magic.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'preload-index.c')
| -rw-r--r-- | preload-index.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/preload-index.c b/preload-index.c index c1fe3a3ef9..af468789f5 100644 --- a/preload-index.c +++ b/preload-index.c @@ -76,6 +76,10 @@ static void preload_index(struct index_state *index, if (!core_preload_index) return; + /* Do not preload when pathspec uses non-threadable subsystems */ + if (pathspec && pathspec_is_non_threadable(pathspec)) + return; /* for now ... */ + threads = index->cache_nr / THREAD_COST; if (threads < 2) return; |