]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'js/fsmonitor-unflake' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:10 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:10 +0000 (14:27 -0700)
commit10432cc810eb9228dde99b38e2b4b37f5c80d12e
tree0a910eec49b51268b53890a259265ba833999b18
parent33f2790ecafd29b8551a290e566003b975807c61
parentb5a81697520621a0a1093f590d60d8e578348843
Merge branch 'js/fsmonitor-unflake' into maint

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