Merge branch 'js/fsmonitor-refresh-after-discarding-index'

The fsmonitor interface got out of sync after the in-core index
file gets discarded, which has been corrected.

* js/fsmonitor-refresh-after-discarding-index:
fsmonitor: force a refresh after the index was discarded
fsmonitor: demonstrate that it is not refreshed after discard_index()

diff --cc cache.h
index fa8ede9a2d6441842f49740482bb74f6c23c1a5d,06ca755c9375e2dfaddfa6b5a47a0061917f680e..b4bb2e2c11adff0061065fa975874c7c4a2a318b
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -340,8 -339,7 +340,9 @@@ struct index_state 
        unsigned name_hash_initialized : 1,
                 initialized : 1,
                 drop_cache_tree : 1,
-                updated_skipworktree : 1;
 +               updated_workdir : 1,
++               updated_skipworktree : 1,
+                fsmonitor_has_run_once : 1;
        struct hashmap name_hash;
        struct hashmap dir_hash;
        struct object_id oid;

diff --cc read-cache.c
Simple merge