Merge branch 'jc/maint-diff-q-filter'

* jc/maint-diff-q-filter:
  diff --quiet: disable optimization when --diff-filter=X is used

diff --cc diff-lib.c
index 1e22992cb10420b9dd6def16f80efc5f196ffbbb,bfa65033734452faae0d5f4365a817f9e35b3e01..2870de400ed533d83c77269ee1654af212c6510c
--- 1/diff-lib.c
--- 2/diff-lib.c
+++ b/diff-lib.c
@@@ -100,13 -72,13 +100,14 @@@ int run_diff_files(struct rev_info *rev
                unsigned int oldmode, newmode;
                struct cache_entry *ce = active_cache[i];
                int changed;
 +              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))
 +              if (!ce_path_match(ce, &revs->prune_data))
                        continue;
  
                if (ce_stage(ce)) {

diff --cc t/t4040-whitespace-status.sh
Simple merge