Merge branch 'dn/test-reject-utf-16'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:10 +0000 (10:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:10 +0000 (10:11 -0700)
* dn/test-reject-utf-16:
t3900: test rejecting log message with NULs correctly
Add missing test file for UTF-16.

t/t3900-i18n-commit.sh
t/t3900/UTF-16.txt [new file with mode: 0644]
index 38b00c37b0606a5442f2dce02647a019f0c80c9e..4bf1dbe9c9f3ffeb1151be07bf75dcd872167916 100755 (executable)
@@ -34,9 +34,9 @@ test_expect_success 'no encoding header for base case' '
        test z = "z$E"
 '
 
-test_expect_failure 'UTF-16 refused because of NULs' '
+test_expect_success 'UTF-16 refused because of NULs' '
        echo UTF-16 >F &&
-       git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
+       test_must_fail git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
 '
 
 test_expect_success 'UTF-8 invalid characters refused' '
diff --git a/t/t3900/UTF-16.txt b/t/t3900/UTF-16.txt
new file mode 100644 (file)
index 0000000..2257f05
Binary files /dev/null and b/t/t3900/UTF-16.txt differ