Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff --quiet: disable optimization when --diff-filter=X is used
[gitweb.git]
/
diff-lib.c
diff --git
a/diff-lib.c
b/diff-lib.c
index b7813af614bc62b563201e22fe0e2bceb2d13833..bfa65033734452faae0d5f4365a817f9e35b3e01 100644
(file)
--- a/
diff-lib.c
+++ b/
diff-lib.c
@@
-74,7
+74,8
@@
int run_diff_files(struct rev_info *revs, unsigned int option)
int changed;
if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
- DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
+ !revs->diffopt.filter &&
+ DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
break;
if (!ce_path_match(ce, revs->prune_data))