diff options
| author | Jeff King <peff@peff.net> | 2011-05-31 11:33:56 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 09:20:31 -0700 |
| commit | af7b41c923677ff9291bab56ec7069922e37453b (patch) | |
| tree | 41de512fac824fd3dd2b7c3de6798322fa1bf840 /tree-diff.c | |
| parent | 2cfe8a68ccba86f046080f890102a9a43361cfdd (diff) | |
| download | git-af7b41c923677ff9291bab56ec7069922e37453b.tar.gz | |
diff_tree: disable QUICK optimization with diff filter
We stop looking for changes early with QUICK, so our diff
queue contains only a subset of the changes. However, we
don't apply diff filters until later; it will appear at that
point as though there are no changes matching our filter,
when in reality we simply didn't keep looking for changes
long enough.
Commit 2cfe8a6 (diff --quiet: disable optimization when
--diff-filter=X is used, 2011-03-16) fixes this in some
cases by disabling the optimization when a filter is
present. However, it only tweaked run_diff_files, missing
the similar case in diff_tree. Thus the fix worked only for
diffing the working tree and index, but not between trees.
Noticed by Yasushi SHOJI.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tree-diff.c b/tree-diff.c index 7d745b4406..70bdb89656 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -287,6 +287,7 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, stru for (;;) { if (DIFF_OPT_TST(opt, QUICK) && + !opt->filter && DIFF_OPT_TST(opt, HAS_CHANGES)) break; if (opt->nr_paths) { |