summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:33 (GMT)
commitcfd635c7428dfca5b45d8d45fdc1311e751d4fe2 (patch)
tree3bd1754e72887659e52ee03342a4a9098fe9c247 /cache.h
parent521d3ef38a17917ad10e71a398e82a13fa1178b5 (diff)
parent398a3b0899dd8a440d4adbcbda38362e3f8359b1 (diff)
downloadgit-cfd635c7428dfca5b45d8d45fdc1311e751d4fe2.zip
git-cfd635c7428dfca5b45d8d45fdc1311e751d4fe2.tar.gz
git-cfd635c7428dfca5b45d8d45fdc1311e751d4fe2.tar.bz2
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()
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index fa8ede9..b4bb2e2 100644
--- a/cache.h
+++ b/cache.h
@@ -341,7 +341,8 @@ struct index_state {
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;