summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-05-07 11:10:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-08 03:03:48 (GMT)
commit398a3b0899dd8a440d4adbcbda38362e3f8359b1 (patch)
treee4231bcbe6bc2fa30593292cb34cabf863d7cbf7 /read-cache.c
parentdc76852df2f7bc5a6c79a796954a81f5af284c34 (diff)
downloadgit-398a3b0899dd8a440d4adbcbda38362e3f8359b1.zip
git-398a3b0899dd8a440d4adbcbda38362e3f8359b1.tar.gz
git-398a3b0899dd8a440d4adbcbda38362e3f8359b1.tar.bz2
fsmonitor: force a refresh after the index was discarded
With this change, the `index_state` struct becomes the new home for the flag that says whether the fsmonitor hook has been run, i.e. it is now per-index. It also gets re-set when the index is discarded, fixing the bug demonstrated by the "test_expect_failure" test added in the preceding commit. In that case fsmonitor-enabled Git would miss updates under certain circumstances, see that preceding commit for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index 0e0c93e..b298c7f 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2307,6 +2307,7 @@ int discard_index(struct index_state *istate)
free_name_hash(istate);
cache_tree_free(&(istate->cache_tree));
istate->initialized = 0;
+ istate->fsmonitor_has_run_once = 0;
FREE_AND_NULL(istate->cache);
istate->cache_alloc = 0;
discard_split_index(istate);