From: Jeff King Date: Tue, 31 May 2011 15:33:56 +0000 (-0400) Subject: diff_tree: disable QUICK optimization with diff filter X-Git-Tag: v1.7.6-rc1~5^2~1 X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/af7b41c923677ff9291bab56ec7069922e37453b?hp=af7b41c923677ff9291bab56ec7069922e37453b 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 Signed-off-by: Junio C Hamano ---