diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-23 21:55:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-23 21:55:17 (GMT) |
| commit | 7d0cf357a31cc8a442342696788d776265482ce9 (patch) | |
| tree | 9b5eb5adb7a70fb7f2aef1af23b06a9a83855c17 /diff-lib.c | |
| parent | 98b256bd0857ab2192fdad27c26edbb0df3d96d1 (diff) | |
| parent | 2cfe8a68ccba86f046080f890102a9a43361cfdd (diff) | |
| download | git-7d0cf357a31cc8a442342696788d776265482ce9.zip git-7d0cf357a31cc8a442342696788d776265482ce9.tar.gz git-7d0cf357a31cc8a442342696788d776265482ce9.tar.bz2 | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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)) |