diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-07 13:10:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 12:03:48 +0900 |
| commit | 398a3b0899dd8a440d4adbcbda38362e3f8359b1 (patch) | |
| tree | e4231bcbe6bc2fa30593292cb34cabf863d7cbf7 /fsmonitor.c | |
| parent | dc76852df2f7bc5a6c79a796954a81f5af284c34 (diff) | |
| download | git-398a3b0899dd8a440d4adbcbda38362e3f8359b1.tar.gz | |
fsmonitor: force a refresh after the index was discarded
With this change, the `index_state` struct becomes the new home for the
flag that says whether the fsmonitor hook has been run, i.e. it is now
per-index.
It also gets re-set when the index is discarded, fixing the bug
demonstrated by the "test_expect_failure" test added in the preceding
commit. In that case fsmonitor-enabled Git would miss updates under
certain circumstances, see that preceding commit for details.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fsmonitor.c')
| -rw-r--r-- | fsmonitor.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fsmonitor.c b/fsmonitor.c index 665bd2d425..1dee0aded1 100644 --- a/fsmonitor.c +++ b/fsmonitor.c @@ -129,7 +129,6 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n void refresh_fsmonitor(struct index_state *istate) { - static int has_run_once = 0; struct strbuf query_result = STRBUF_INIT; int query_success = 0; size_t bol; /* beginning of line */ @@ -137,9 +136,9 @@ void refresh_fsmonitor(struct index_state *istate) char *buf; int i; - if (!core_fsmonitor || has_run_once) + if (!core_fsmonitor || istate->fsmonitor_has_run_once) return; - has_run_once = 1; + istate->fsmonitor_has_run_once = 1; trace_printf_key(&trace_fsmonitor, "refresh fsmonitor"); /* |