Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff_tree: disable QUICK optimization with diff filter
[gitweb.git]
/
tree-diff.c
diff --git
a/tree-diff.c
b/tree-diff.c
index 7d745b44061955ced9ce4624a498647a1d8d32a5..70bdb896562a6480c49efdb51151ba00f7e11d5b 100644
(file)
--- a/
tree-diff.c
+++ b/
tree-diff.c
@@
-287,6
+287,7
@@
int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, stru
for (;;) {
if (DIFF_OPT_TST(opt, QUICK) &&
+ !opt->filter &&
DIFF_OPT_TST(opt, HAS_CHANGES))
break;
if (opt->nr_paths) {