From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2019 17:15:17 +0000 (-0700)
Subject: Merge branch 'js/fsmonitor-unflake'
X-Git-Tag: v2.23.0-rc0~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3e6b426b95e5a31a884101b7bea4e5d075aea06;p=thirdparty%2Fgit.git

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
---

a3e6b426b95e5a31a884101b7bea4e5d075aea06