summaryrefslogtreecommitdiff
path: root/system/git/dont-test-other-encodings.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-10-22 21:23:35 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-10-22 21:23:35 +0000
commit0cc6ef2bff23c5e8f8dbe0a7da0686bbdb44ba7d (patch)
tree8886eb4d7f737a137fce69553b38d46d1dea7802 /system/git/dont-test-other-encodings.patch
parent36fda45e7b714dfb6c39a2b236a342374446f912 (diff)
downloadpackages-0cc6ef2bff23c5e8f8dbe0a7da0686bbdb44ba7d.tar.gz
packages-0cc6ef2bff23c5e8f8dbe0a7da0686bbdb44ba7d.tar.bz2
packages-0cc6ef2bff23c5e8f8dbe0a7da0686bbdb44ba7d.tar.xz
packages-0cc6ef2bff23c5e8f8dbe0a7da0686bbdb44ba7d.zip
system/git: bugfix bump to 2.19.1
Diffstat (limited to 'system/git/dont-test-other-encodings.patch')
-rw-r--r--system/git/dont-test-other-encodings.patch16
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" &&
-