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

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

diff --cc diff-lib.c
index 392ce2bef05746cea7922d39da67bf25d1d3d192,bfa65033734452faae0d5f4365a817f9e35b3e01..f8e33256ebe7ecd6ebf69669d9bfe50488c01fa1
--- 1/diff-lib.c
--- 2/diff-lib.c
+++ b/diff-lib.c
@@@ -100,10 -72,10 +100,11 @@@ 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))

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