From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:33 +0000 (+0900)
Subject: Merge branch 'js/fsmonitor-refresh-after-discarding-index'
X-Git-Tag: v2.22.0-rc1~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cfd635c7428dfca5b45d8d45fdc1311e751d4fe2

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()
---

cfd635c7428dfca5b45d8d45fdc1311e751d4fe2
diff --cc cache.h
index fa8ede9a2d,06ca755c93..b4bb2e2c11
--- a/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_workdir : 1,
- 		 updated_skipworktree : 1;
++		 updated_skipworktree : 1,
+ 		 fsmonitor_has_run_once : 1;
  	struct hashmap name_hash;
  	struct hashmap dir_hash;
  	struct object_id oid;