diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-06 18:40:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-06 18:40:14 (GMT) |
| commit | 456a4c08b8d8ddefda939014c15877ace3e3f499 (patch) | |
| tree | 02e78225fadc62bb3585494b9cb418d833bd8e01 /tree-diff.c | |
| parent | 6c92972d7f5ab247a8cab5e4b88cb281bf201970 (diff) | |
| parent | 28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (diff) | |
| download | git-456a4c08b8d8ddefda939014c15877ace3e3f499.zip git-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.gz git-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.bz2 | |
Merge branch 'jk/diff-not-so-quick'
* jk/diff-not-so-quick:
diff: futureproof "stop feeding the backend early" logic
diff_tree: disable QUICK optimization with diff filter
Conflicts:
diff.c
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tree-diff.c b/tree-diff.c index 3f40725..b3cc2e4 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); |