Skip to content

Commit

Permalink
Merge branch 'dn/test-reject-utf-16'
Browse files Browse the repository at this point in the history
* dn/test-reject-utf-16:
  t3900: test rejecting log message with NULs correctly
  Add missing test file for UTF-16.
  • Loading branch information
Junio C Hamano committed Aug 5, 2013
2 parents c8abf65 + 0ed45a1 commit d6f3ab5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t3900-i18n-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
Expand Down
Binary file added t/t3900/UTF-16.txt
Binary file not shown.

0 comments on commit d6f3ab5

Please sign in to comment.