aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-06 11:40:14 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-06 11:40:14 -0700
commit456a4c08b8d8ddefda939014c15877ace3e3f499 (patch)
tree02e78225fadc62bb3585494b9cb418d833bd8e01 /t
parent6c92972d7f5ab247a8cab5e4b88cb281bf201970 (diff)
parent28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (diff)
downloadgit-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.gz
git-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.xz
Merge branch 'jk/diff-not-so-quick'
* jk/diff-not-so-quick: diff: futureproof "stop feeding the backend early" logic diff_tree: disable QUICK optimization with diff filter Conflicts: diff.c
Diffstat (limited to 't')
-rwxr-xr-xt/t4040-whitespace-status.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4040-whitespace-status.sh b/t/t4040-whitespace-status.sh
index abc49348b..3c728a3eb 100755
--- a/t/t4040-whitespace-status.sh
+++ b/t/t4040-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