diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-07 16:21:40 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-07 12:27:02 -0800 |
commit | 0cacebf099dd6467845419f212acdcfe5f8d923f (patch) | |
tree | 0495def2eef78e004145945ec0a1dee7a66731d1 /fsmonitor.c | |
parent | b6731550749c7326f0dcf26211e7c2e55de00e28 (diff) | |
download | git-0cacebf099dd6467845419f212acdcfe5f8d923f.tar.gz |
dir.c: ignore paths containing .git when invalidating untracked cachend/fix-untracked-cache-invalidation
read_directory() code ignores all paths named ".git" even if it's not
a valid git repository. See treat_path() for details. Since ".git" is
basically invisible to read_directory(), when we are asked to
invalidate a path that contains ".git", we can safely ignore it
because the slow path would not consider it anyway.
This helps when fsmonitor is used and we have a real ".git" repo at
worktree top. Occasionally .git/index will be updated and if the
fsmonitor hook does not filter it, untracked cache is asked to
invalidate the path ".git/index".
Without this patch, we invalidate the root directory unncessarily,
which:
- makes read_directory() fall back to slow path for root directory
(slower)
- makes the index dirty (because UNTR extension is updated). Depending
on the index size, writing it down could also be slow.
A note about the new "safe_path" knob. Since this new check could be
relatively expensive, avoid it when we know it's not needed. If the
path comes from the index, it can't contain ".git". If it does
contain, we may be screwed up at many more levels, not just this one.
Noticed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fsmonitor.c')
-rw-r--r-- | fsmonitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fsmonitor.c b/fsmonitor.c index 0af7c4edba..6d7bcd5d0e 100644 --- a/fsmonitor.c +++ b/fsmonitor.c @@ -130,7 +130,7 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n * as it could be a new untracked file. */ trace_printf_key(&trace_fsmonitor, "fsmonitor_refresh_callback '%s'", name); - untracked_cache_invalidate_path(istate, name); + untracked_cache_invalidate_path(istate, name, 0); } void refresh_fsmonitor(struct index_state *istate) |