@matheusbsbs / matheus-bagliano / commits / af7b41c923

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>

Jeff King committed May 31, 2011 at 11:33 UTC af7b41c923677ff9291bab56ec7069922e37453b
2 files changed +6
t/t4037-whitespace-status.sh
+5
@@ -67,4 +67,9 @@ test_expect_success 'diff-files --diff-filter --quiet' '
67 test_must_fail git diff-files --diff-filter=M --quiet
68 '
69
70 +test_expect_success 'diff-tree --diff-filter --quiet' '
71 + git commit -a -m "worktree state" &&
72 + test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
73 +'
74 +
75 test_done
tree-diff.c
+1
@@ -287,6 +287,7 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, stru
287
288 for (;;) {
289 if (DIFF_OPT_TST(opt, QUICK) &&
290 + !opt->filter &&
291 DIFF_OPT_TST(opt, HAS_CHANGES))
292 break;
293 if (opt->nr_paths) {