diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:10 -0700 |
| commit | 10432cc810eb9228dde99b38e2b4b37f5c80d12e (patch) | |
| tree | 0a910eec49b51268b53890a259265ba833999b18 /diff-lib.c | |
| parent | 33f2790ecafd29b8551a290e566003b975807c61 (diff) | |
| parent | b5a81697520621a0a1093f590d60d8e578348843 (diff) | |
| download | git-10432cc810eb9228dde99b38e2b4b37f5c80d12e.tar.xz | |
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
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; } |