X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-lib.c;h=2870de400ed533d83c77269ee1654af212c6510c;hb=1de0746d849c64e1f4d160f9915d87d39c0794ea;hp=1e22992cb10420b9dd6def16f80efc5f196ffbbb;hpb=af2b1848ccf43d5df9f47e0a4fab1ac6f58be78e;p=git.git diff --git a/diff-lib.c b/diff-lib.c index 1e22992cb..2870de400 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))