diff options
| author | Alex Vandiver <alexmv@dropbox.com> | 2018-01-02 19:04:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-04 15:06:43 -0800 |
| commit | fa49029577c93b507f875d3809ddd56429deef65 (patch) | |
| tree | e9336d8e6f604eb94767ec9f5a99d81aab1ac696 /diff-lib.c | |
| parent | a75d1104072a035307e48b9d7c2696760c3a1f9a (diff) | |
| download | git-av/fsmonitor-updates.tar.gz | |
fsmonitor: use fsmonitor data in `git diff`av/fsmonitor-updates
This makes use of the fsmonitor extension to skip lstat() calls on
files that fsmonitor judged as unmodified. We skip use of the
fsmonitor extension when called by "add" because the format_callback
in such cases expects to be called even when the file is believed to
be "up to date" with the index.
Signed-off-by: Alex Vandiver <alexmv@dropbox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index 8104603a3b..13ff00d81e 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -95,6 +95,9 @@ int run_diff_files(struct rev_info *revs, unsigned int option) diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); + if (!(option & DIFF_SKIP_FSMONITOR)) + refresh_fsmonitor(&the_index); + if (diff_unmerged_stage < 0) diff_unmerged_stage = 2; entries = active_nr; @@ -197,6 +200,9 @@ int run_diff_files(struct rev_info *revs, unsigned int option) if (ce_uptodate(ce) || ce_skip_worktree(ce)) continue; + if (ce->ce_flags & CE_FSMONITOR_VALID && !(option & DIFF_SKIP_FSMONITOR)) + continue; + /* If CE_VALID is set, don't look at workdir for file removal */ if (ce->ce_flags & CE_VALID) { changed = 0; |