From: Ben Peart Date: Tue, 10 Apr 2018 18:14:31 +0000 (-0400) Subject: fsmonitor: force index write after full scan X-Git-Tag: v2.18.0-rc0~111^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca598d5f2ab988935a5b882b44122cbfa5fd99f5;p=thirdparty%2Fgit.git fsmonitor: force index write after full scan fsmonitor currently only flags the index as dirty if the extension is being added or removed. This is a performance optimization that recognizes you can stat() a lot of files in less time than it takes to write out an updated index. This patch makes a small enhancement and flags the index dirty if we end up having to stat() all files and scan the entire working directory. The assumption being that must be expensive or you would not have turned on the feature. Signed-off-by: Ben Peart Signed-off-by: Junio C Hamano --- diff --git a/fsmonitor.c b/fsmonitor.c index 6d7bcd5d0e..2b4d3bb0a2 100644 --- a/fsmonitor.c +++ b/fsmonitor.c @@ -185,6 +185,9 @@ void refresh_fsmonitor(struct index_state *istate) for (i = 0; i < istate->cache_nr; i++) istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID; + /* If we're going to check every file, ensure we save the results */ + istate->cache_changed |= FSMONITOR_CHANGED; + if (istate->untracked) istate->untracked->use_fsmonitor = 0; }