X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=diff-lib.c;h=f8e33256ebe7ecd6ebf69669d9bfe50488c01fa1;hb=bcf3d1fd9ccc04350d793c077d3c112fb26f43f0;hp=392ce2bef05746cea7922d39da67bf25d1d3d192;hpb=5ce3258122939f93a927c75d308c1c34038f0386;p=thirdparty%2Fgit.git diff --git a/diff-lib.c b/diff-lib.c index 392ce2bef0..f8e33256eb 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))