diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-05 10:11:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 10:11:10 -0700 |
| commit | d6f3ab573ee48927c7ef272e56b043758feb0a81 (patch) | |
| tree | 4eddab6e00061793df143b40f826d8cfafd36a1a | |
| parent | c8abf659f7b1669f949c6476e73c62c11ffd816c (diff) | |
| parent | 0ed45a1cd6571ed89a09791730a9089e932b7c1f (diff) | |
| download | git-d6f3ab573ee48927c7ef272e56b043758feb0a81.tar.gz | |
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.
| -rwxr-xr-x | t/t3900-i18n-commit.sh | 4 | ||||
| -rw-r--r-- | t/t3900/UTF-16.txt | bin | 0 -> 146 bytes |
2 files changed, 2 insertions, 2 deletions
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 Binary files differnew file mode 100644 index 0000000000..2257f05a99 --- /dev/null +++ b/t/t3900/UTF-16.txt |