diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 09:45:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 09:45:33 +0200 |
| commit | cfd635c7428dfca5b45d8d45fdc1311e751d4fe2 (patch) | |
| tree | 3bd1754e72887659e52ee03342a4a9098fe9c247 /read-cache.c | |
| parent | Merge branch 'cm/notes-comment-fix' (diff) | |
| parent | fsmonitor: force a refresh after the index was discarded (diff) | |
| download | git-cfd635c7428dfca5b45d8d45fdc1311e751d4fe2.tar.xz git-cfd635c7428dfca5b45d8d45fdc1311e751d4fe2.zip | |
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 'read-cache.c')
| -rw-r--r-- | read-cache.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index 4fad4e3f9a..22e7b9944e 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2326,6 +2326,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); |