Re: [PATCH] Add missing test file for UTF-16.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 5, 2013, 16:44 UTC
- Message-ID
- <7vtxj4kry1.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <CACsJy8CT3uxp99n9VUXDbL30WEDcuRreeJBaqBcx9Ujici67VA@mail.gmail.com>
Duy Nguyen <pclouds@gmail.com> writes:
Show 11 quoted lines
> On Sun, Aug 4, 2013 at 12:26 AM, brian m. carlson > <sandals@crustytoothpaste.net> wrote: >> The test file that the UTF-16 rejection test looks for is missing, but this went >> unnoticed because the test is expected to fail anyway; as a consequence, the >> test fails because the file containing the commit message is missing, and not >> because the test file contains a NUL byte. Fix this by including a sample text >> file containing a commit message encoded in UTF-16. > > Tested-by: Duy Nguyen <pclouds@gmai.com> > > and sorry, my bad. I think we need your sign-off in this patch.
I think 37576c14 (commit_tree(): refuse commit messages that contain NULs, 2011-12-15) that marked this test with "test_expect_failure" is broken with or without this fix. It should be more like so:
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index 37ddabb..5e72d72 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 '