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 /tree-diff.c | |
| parent | af7b41c923677ff9291bab56ec7069922e37453b (diff) | |
| download | git-28b9264dd6cbadcef8b3e48c24ffcb2893b668b3.tar.gz git-28b9264dd6cbadcef8b3e48c24ffcb2893b668b3.tar.xz | |
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 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tree-diff.c b/tree-diff.c index 70bdb8965..33881d1ad 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -286,9 +286,7 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, stru int baselen = strlen(base); for (;;) { - if (DIFF_OPT_TST(opt, QUICK) && - !opt->filter && - DIFF_OPT_TST(opt, HAS_CHANGES)) + if (diff_can_quit_early(opt)) break; if (opt->nr_paths) { skip_uninteresting(t1, base, baselen, opt); |