diff options
| -rw-r--r-- | diff-lib.c | 4 | ||||
| -rw-r--r-- | diff.c | 7 | ||||
| -rw-r--r-- | diff.h | 2 | ||||
| -rw-r--r-- | tree-diff.c | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/diff-lib.c b/diff-lib.c index bfa6503373..869d8f0e77 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -73,9 +73,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) struct cache_entry *ce = active_cache[i]; int changed; - 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)) @@ -3513,6 +3513,13 @@ int diff_result_code(struct diff_options *opt, int status) return result; } +int diff_can_quit_early(struct diff_options *opt) +{ + return (DIFF_OPT_TST(opt, QUICK) && + !opt->filter && + DIFF_OPT_TST(opt, HAS_CHANGES)); +} + void diff_addremove(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, @@ -170,6 +170,8 @@ extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_ void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); +extern int diff_can_quit_early(struct diff_options *); + extern void diff_addremove(struct diff_options *, int addremove, unsigned mode, diff --git a/tree-diff.c b/tree-diff.c index 70bdb89656..33881d1ad0 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -286,9 +286,7 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, stru int baselen = strlen(base); for (;;) { - if (DIFF_OPT_TST(opt, QUICK) && - !opt->filter && - DIFF_OPT_TST(opt, HAS_CHANGES)) + if (diff_can_quit_early(opt)) break; if (opt->nr_paths) { skip_uninteresting(t1, base, baselen, opt); |