diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 |
| commit | 456a4c08b8d8ddefda939014c15877ace3e3f499 (patch) | |
| tree | 02e78225fadc62bb3585494b9cb418d833bd8e01 /diff-lib.c | |
| parent | 6c92972d7f5ab247a8cab5e4b88cb281bf201970 (diff) | |
| parent | 28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (diff) | |
| download | git-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.gz | |
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 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/diff-lib.c b/diff-lib.c index 3b5f2242a5..9c29293bbc 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -102,9 +102,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) int changed; unsigned dirty_submodule = 0; - if (DIFF_OPT_TST(&revs->diffopt, QUICK) && - !revs->diffopt.filter && - DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES)) + if (diff_can_quit_early(&revs->diffopt)) break; if (!ce_path_match(ce, &revs->prune_data)) |