diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:18 -0700 |
| commit | a3e6b426b95e5a31a884101b7bea4e5d075aea06 (patch) | |
| tree | a4ae23d11e7bd12edac2a70c05131a4a6b6549a7 /diff-lib.c | |
| parent | bdc81d15a238c4402cc493817086a0c50dc9a508 (diff) | |
| parent | b5a81697520621a0a1093f590d60d8e578348843 (diff) | |
| download | git-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 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index a838c219ec..61812f48c2 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -232,7 +232,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) if (!changed && !dirty_submodule) { ce_mark_uptodate(ce); - mark_fsmonitor_valid(ce); + mark_fsmonitor_valid(istate, ce); if (!revs->diffopt.flags.find_copies_harder) continue; } |