Merge branch 'jc/maint-rerere-in-workdir'

diff --git a/diff-lib.c b/diff-lib.c
index 1e22992cb10420b9dd6def16f80efc5f196ffbbb..2870de400ed533d83c77269ee1654af212c6510c 100644 (file)
--- 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))