diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:07:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:07:51 +0900 |
| commit | c9fdbca92c66b93f95a19bf1f38ab9088db78540 (patch) | |
| tree | b0aaedc6f6c92d0de8a8fe49a19f8522653bcd96 /read-cache.c | |
| parent | e05336bddacb90cf243aacc0f7b7f34f900453d7 (diff) | |
| parent | 1fff303fc2b31d5005f38f55f38c4e8521da5a93 (diff) | |
| download | git-c9fdbca92c66b93f95a19bf1f38ab9088db78540.tar.gz | |
Merge branch 'av/fsmonitor'
Various fixes to bp/fsmonitor topic.
* av/fsmonitor:
fsmonitor: simplify determining the git worktree under Windows
fsmonitor: store fsmonitor bitmap before splitting index
fsmonitor: read from getcwd(), not the PWD environment variable
fsmonitor: delay updating state until after split index is merged
fsmonitor: document GIT_TRACE_FSMONITOR
fsmonitor: don't bother pretty-printing JSON from watchman
fsmonitor: set the PWD to the top of the working tree
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index 87e88b2642..fbb4967c81 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2535,6 +2535,9 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock, int new_shared_index, ret; struct split_index *si = istate->split_index; + if (istate->fsmonitor_last_update) + fill_fsmonitor_bitmap(istate); + if (!si || alternate_index_output || (istate->cache_changed & ~EXTMASK)) { if (si) |