diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-06 18:40:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-06 18:40:14 (GMT) |
| commit | 456a4c08b8d8ddefda939014c15877ace3e3f499 (patch) | |
| tree | 02e78225fadc62bb3585494b9cb418d833bd8e01 /t/t4040-whitespace-status.sh | |
| parent | 6c92972d7f5ab247a8cab5e4b88cb281bf201970 (diff) | |
| parent | 28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (diff) | |
| download | git-456a4c08b8d8ddefda939014c15877ace3e3f499.zip git-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.gz git-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.bz2 | |
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/t4040-whitespace-status.sh')
| -rwxr-xr-x | t/t4040-whitespace-status.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4040-whitespace-status.sh b/t/t4040-whitespace-status.sh index abc4934..3c728a3 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 |