summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-23 14:55:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-23 14:55:17 -0700
commit7d0cf357a31cc8a442342696788d776265482ce9 (patch)
tree9b5eb5adb7a70fb7f2aef1af23b06a9a83855c17 /diff-lib.c
parent98b256bd0857ab2192fdad27c26edbb0df3d96d1 (diff)
parent2cfe8a68ccba86f046080f890102a9a43361cfdd (diff)
downloadgit-7d0cf357a31cc8a442342696788d776265482ce9.tar.gz
Merge branch 'jc/maint-diff-q-filter'
* jc/maint-diff-q-filter: diff --quiet: disable optimization when --diff-filter=X is used
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 1e22992cb1..2870de400e 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -103,7 +103,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
unsigned dirty_submodule = 0;
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))