From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Aug 2013 17:11:10 +0000 (-0700)
Subject: Merge branch 'dn/test-reject-utf-16'
X-Git-Tag: v1.8.4-rc2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d6f3ab573ee48927c7ef272e56b043758feb0a81?hp=c8abf659f7b1669f949c6476e73c62c11ffd816c

Merge branch 'dn/test-reject-utf-16'

* dn/test-reject-utf-16:
t3900: test rejecting log message with NULs correctly
Add missing test file for UTF-16.
---

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 38b00c37b0..4bf1dbe9c9 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -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
index 0000000000..2257f05a99
Binary files /dev/null and b/t/t3900/UTF-16.txt differ