diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:34:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:34:54 -0800 |
| commit | 7fe5e637abc0529785a2b29b0c408d02191a6555 (patch) | |
| tree | 78101488d38c79a77ef063d7ba399a8ff20aec30 | |
| parent | Merge branch 'mh/shorten-unambigous-ref' (diff) | |
| parent | diff test: reading a directory as a file need not error out (diff) | |
| download | tgif-7fe5e637abc0529785a2b29b0c408d02191a6555.tar.xz | |
Merge branch 'sb/diff-orderfile-config'
Finishing touches to avoid casting unnecessary detail in stone.
* sb/diff-orderfile-config:
diff test: reading a directory as a file need not error out
| -rwxr-xr-x | t/t4056-diff-order.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh index 1ddd226b78..9e2b29ede5 100755 --- a/t/t4056-diff-order.sh +++ b/t/t4056-diff-order.sh @@ -68,10 +68,6 @@ test_expect_success POSIXPERM,SANITY 'unreadable orderfile' ' test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD ' -test_expect_success 'orderfile is a directory' ' - test_must_fail git diff -O/ --name-only HEAD^..HEAD -' - for i in 1 2 do test_expect_success "orderfile using option ($i)" ' |