aboutsummaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-17 10:15:17 -0700
committerJunio C Hamano <gitster@pobox.com>2019-06-17 10:15:18 -0700
commita3e6b426b95e5a31a884101b7bea4e5d075aea06 (patch)
treea4ae23d11e7bd12edac2a70c05131a4a6b6549a7 /entry.c
parentbdc81d15a238c4402cc493817086a0c50dc9a508 (diff)
parentb5a81697520621a0a1093f590d60d8e578348843 (diff)
downloadgit-a3e6b426b95e5a31a884101b7bea4e5d075aea06.tar.xz
Merge branch 'js/fsmonitor-unflake'
The data collected by fsmonitor was not properly written back to the on-disk index file, breaking t7519 tests occasionally, which has been corrected. * js/fsmonitor-unflake: mark_fsmonitor_valid(): mark the index as changed if needed fill_stat_cache_info(): prepare for an fsmonitor fix
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/entry.c b/entry.c
index 0e4f2f2910..53380bb614 100644
--- a/entry.c
+++ b/entry.c
@@ -373,7 +373,7 @@ finish:
if (lstat(ce->name, &st) < 0)
return error_errno("unable to stat just-written file %s",
ce->name);
- fill_stat_cache_info(ce, &st);
+ fill_stat_cache_info(state->istate, ce, &st);
ce->ce_flags |= CE_UPDATE_IN_BASE;
mark_fsmonitor_invalid(state->istate, ce);
state->istate->cache_changed |= CE_ENTRY_CHANGED;