diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 09:14:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 09:21:36 -0700 |
| commit | 28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (patch) | |
| tree | 2b44427e3c46bf333a17cab937a340ed611e4489 /diff-lib.c | |
| parent | af7b41c923677ff9291bab56ec7069922e37453b (diff) | |
| download | git-28b9264dd6cbadcef8b3e48c24ffcb2893b668b3.tar.gz | |
diff: futureproof "stop feeding the backend early" logic
Refactor the "do not stop feeding the backend early" logic into a small
helper function and use it in both run_diff_files() and diff_tree() that
has the stop-early optimization. We may later add other types of diffcore
transformation that require to look at the whole result like diff-filter
does, and having the logic in a single place is essential for longer term
maintainability.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/diff-lib.c b/diff-lib.c index bfa6503373..869d8f0e77 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -73,9 +73,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) struct cache_entry *ce = active_cache[i]; int changed; - if (DIFF_OPT_TST(&revs->diffopt, QUICK) && - !revs->diffopt.filter && - DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES)) + if (diff_can_quit_early(&revs->diffopt)) break; if (!ce_path_match(ce, revs->prune_data)) |