summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 16:14:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-31 16:21:36 (GMT)
commit28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (patch)
tree2b44427e3c46bf333a17cab937a340ed611e4489 /tree-diff.c
parentaf7b41c923677ff9291bab56ec7069922e37453b (diff)
downloadgit-28b9264dd6cbadcef8b3e48c24ffcb2893b668b3.zip
git-28b9264dd6cbadcef8b3e48c24ffcb2893b668b3.tar.gz
git-28b9264dd6cbadcef8b3e48c24ffcb2893b668b3.tar.bz2
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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/tree-diff.c b/tree-diff.c
index 70bdb89..33881d1 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);