X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tree-diff.c;h=b3cc2e4753447d4734ed08a70e3396771257dced;hb=77471646d3d87691b4bcf11682945e6ccc27f9e3;hp=3f4072525b9489a86b2231748abe13c611e05274;hpb=a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a;p=git.git diff --git a/tree-diff.c b/tree-diff.c index 3f4072525..b3cc2e475 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -142,8 +142,7 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2, strbuf_add(&base, base_str, baselen); for (;;) { - if (DIFF_OPT_TST(opt, QUICK) && - DIFF_OPT_TST(opt, HAS_CHANGES)) + if (diff_can_quit_early(opt)) break; if (opt->pathspec.nr) { skip_uninteresting(t1, &base, opt, &t1_match);