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 /t | |
| parent | 2cfe8a68ccba86f046080f890102a9a43361cfdd (diff) | |
| download | git-af7b41c923677ff9291bab56ec7069922e37453b.tar.gz git-af7b41c923677ff9291bab56ec7069922e37453b.tar.xz | |
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 't')
| -rwxr-xr-x | t/t4037-whitespace-status.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4037-whitespace-status.sh b/t/t4037-whitespace-status.sh index abc49348b..3c728a3eb 100755 --- a/t/t4037-whitespace-status.sh +++ b/t/t4037-whitespace-status.sh @@ -67,4 +67,9 @@ test_expect_success 'diff-files --diff-filter --quiet' ' test_must_fail git diff-files --diff-filter=M --quiet ' +test_expect_success 'diff-tree --diff-filter --quiet' ' + git commit -a -m "worktree state" && + test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD +' + test_done |