X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=diff-lib.c;h=2870de400ed533d83c77269ee1654af212c6510c;hb=642f85faab27adec13eced36cd7e7548311f6c87;hp=1e22992cb10420b9dd6def16f80efc5f196ffbbb;hpb=4b28cd9f2fb755cdfe1b97130e84644ae932988c;p=thirdparty%2Fgit.git diff --git a/diff-lib.c b/diff-lib.c index 1e22992cb1..2870de400e 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))