diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:26 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:26 -0800 |
commit | f35ccd9be2db9a55afd09ed1a9338c758fa63d82 (patch) | |
tree | c94f3c518cdadb2c478e066547f152d3c753fb36 /t | |
parent | Merge branch 'jk/maint-do-not-feed-stdin-to-tests' (diff) | |
parent | commit_tree(): refuse commit messages that contain NULs (diff) | |
download | tgif-f35ccd9be2db9a55afd09ed1a9338c758fa63d82.tar.xz |
Merge branch 'nd/war-on-nul-in-commit'
* nd/war-on-nul-in-commit:
commit_tree(): refuse commit messages that contain NULs
Convert commit_tree() to take strbuf as message
merge: abort if fails to commit
Conflicts:
builtin/commit.c
commit.c
commit.h
Diffstat (limited to 't')
-rwxr-xr-x | t/t3900-i18n-commit.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index 1f62c151b0..d48a7c002d 100755 --- a/t/t3900-i18n-commit.sh +++ b/t/t3900-i18n-commit.sh @@ -34,6 +34,12 @@ test_expect_success 'no encoding header for base case' ' test z = "z$E" ' +test_expect_failure 'UTF-16 refused because of NULs' ' + echo UTF-16 >F && + git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt +' + + for H in ISO8859-1 eucJP ISO-2022-JP do test_expect_success "$H setup" ' |