diff options
Diffstat (limited to 'system/git/dont-test-other-encodings.patch')
| -rw-r--r-- | system/git/dont-test-other-encodings.patch | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index fed4a6e21..d1c917821 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -1,18 +1,8 @@ We can't support Japanese people using musl ---- git-2.14.1/t/t5100-mailinfo.sh.old 2017-08-09 14:54:31.000000000 -0500 -+++ git-2.14.1/t/t5100-mailinfo.sh 2017-09-10 23:26:39.206126739 -0500 -@@ -27,6 +27,7 @@ - - for mail in 00* - do -+ if [ $mail == 0004 ]; then continue; fi - test_expect_success "mailinfo $mail" ' - check_mailinfo "$mail" "" && - if test -f "$DATA/msg$mail--scissors" --- git-2.14.1/t/t8005-blame-i18n.sh.old 2017-08-09 14:54:31.000000000 -0500 +++ git-2.14.1/t/t8005-blame-i18n.sh 2017-09-16 00:42:35.123728809 -0500 -@@ -24,43 +24,10 @@ +@@ -31,43 +31,10 @@ git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG" ' @@ -58,7 +48,7 @@ We can't support Japanese people using musl summary $UTF8_MSG --- git-2.21.0/t/t0028-working-tree-encoding.sh.old 2019-02-24 16:31:46.000000000 +0000 +++ git-2.21.0/t/t0028-working-tree-encoding.sh 2019-03-08 00:49:07.580000000 +0000 -@@ -51,14 +51,6 @@ +@@ -58,14 +58,6 @@ test_cmp_bin test.utf8.raw test.utf16.git ' @@ -73,17 +63,17 @@ We can't support Japanese people using musl test_expect_success 're-encode to UTF-16-LE-BOM on checkout' ' rm test.utf16lebom && git checkout test.utf16lebom && -@@ -123,41 +115,6 @@ - test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out && - test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out +@@ -131,41 +123,6 @@ + test_grep "fatal: BOM is required .* utf-${i}" err.out && + test_grep "use UTF-${i}BE or UTF-${i}LE" err.out ' - - test_expect_success "eol conversion for UTF-${i} encoded files on checkout" ' - test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" && - test_when_finished "git reset --hard HEAD^" && - -- cat lf.utf8.raw | write_utf${i} >lf.utf${i}.raw && -- cat crlf.utf8.raw | write_utf${i} >crlf.utf${i}.raw && +- write_utf${i} <lf.utf8.raw >lf.utf${i}.raw && +- write_utf${i} <crlf.utf8.raw >crlf.utf${i}.raw && - cp crlf.utf${i}.raw eol.utf${i} && - - cat >expectIndexLF <<-EOF && |