diff options
Diffstat (limited to 'system/git/dont-test-other-encodings.patch')
| -rw-r--r-- | system/git/dont-test-other-encodings.patch | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index 54a4012fe..29c4bdb34 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -191,12 +191,14 @@ We can't support Japanese people using musl cat >expected <<EOF author $UTF8_NAME summary $UTF8_MSG ---- git-2.18.0/t/t0028-working-tree-encoding.sh.old 2018-06-21 17:18:50.000000000 +0000 -+++ git-2.18.0/t/t0028-working-tree-encoding.sh 2018-09-05 17:42:14.650000000 +0000 -@@ -6,240 +6,4 @@ +--- git-2.19.1/t/t0028-working-tree-encoding.sh.old 2018-09-27 20:46:40.000000000 +0000 ++++ git-2.19.1/t/t0028-working-tree-encoding.sh 2018-10-22 20:59:17.530000000 +0000 +@@ -4,246 +4,4 @@ - GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING + . ./test-lib.sh +-GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING +- -test_expect_success 'setup test files' ' - git config core.eol lf && - @@ -394,7 +396,11 @@ We can't support Japanese people using musl - test_i18ngrep "error: BOM is required" err.out -' - --test_expect_success 'check roundtrip encoding' ' +-test_lazy_prereq ICONV_SHIFT_JIS ' +- iconv -f UTF-8 -t SHIFT-JIS </dev/null +-' +- +-test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' ' - test_when_finished "rm -f roundtrip.shift roundtrip.utf16" && - test_when_finished "git reset --hard HEAD" && - |