diff options
Diffstat (limited to 'harmony/git/dont-test-other-encodings.patch')
| -rw-r--r-- | harmony/git/dont-test-other-encodings.patch | 193 |
1 files changed, 193 insertions, 0 deletions
diff --git a/harmony/git/dont-test-other-encodings.patch b/harmony/git/dont-test-other-encodings.patch new file mode 100644 index 000000000..98949bc1b --- /dev/null +++ b/harmony/git/dont-test-other-encodings.patch @@ -0,0 +1,193 @@ +We can't support Japanese people using musl + +--- git-2.14.1/t/t3900-i18n-commit.sh.old 2017-08-09 14:54:31.000000000 -0500 ++++ git-2.14.1/t/t3900-i18n-commit.sh 2017-09-10 21:10:09.269860087 -0500 +@@ -76,132 +76,4 @@ + test_i18ngrep "did not conform" "$HOME"/stderr + ' + +-for H in ISO8859-1 eucJP ISO-2022-JP +-do +- test_expect_success "$H setup" ' +- git config i18n.commitencoding $H && +- git checkout -b $H C0 && +- echo $H >F && +- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt +- ' +-done +- +-for H in ISO8859-1 eucJP ISO-2022-JP +-do +- test_expect_success "check encoding header for $H" ' +- E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") && +- test "z$E" = "z'$H'" +- ' +-done +- +-test_expect_success 'config to remove customization' ' +- git config --unset-all i18n.commitencoding && +- if Z=$(git config --get-all i18n.commitencoding) +- then +- echo Oops, should have failed. +- false +- else +- test z = "z$Z" +- fi && +- git config i18n.commitencoding UTF-8 +-' +- +-test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' +- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt +-' +- +-for H in eucJP ISO-2022-JP +-do +- test_expect_success "$H should be shown in UTF-8 now" ' +- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt +- ' +-done +- +-test_expect_success 'config to add customization' ' +- git config --unset-all i18n.commitencoding && +- if Z=$(git config --get-all i18n.commitencoding) +- then +- echo Oops, should have failed. +- false +- else +- test z = "z$Z" +- fi +-' +- +-for H in ISO8859-1 eucJP ISO-2022-JP +-do +- test_expect_success "$H should be shown in itself now" ' +- git config i18n.commitencoding '$H' && +- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$H'.txt +- ' +-done +- +-test_expect_success 'config to tweak customization' ' +- git config i18n.logoutputencoding UTF-8 +-' +- +-test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' +- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt +-' +- +-for H in eucJP ISO-2022-JP +-do +- test_expect_success "$H should be shown in UTF-8 now" ' +- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt +- ' +-done +- +-for J in eucJP ISO-2022-JP +-do +- if test "$J" = ISO-2022-JP +- then +- ICONV=$J +- else +- ICONV= +- fi +- git config i18n.logoutputencoding $J +- for H in eucJP ISO-2022-JP +- do +- test_expect_success "$H should be shown in $J now" ' +- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV +- ' +- done +-done +- +-for H in ISO8859-1 eucJP ISO-2022-JP +-do +- test_expect_success "No conversion with $H" ' +- compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt +- ' +-done +- +-test_commit_autosquash_flags () { +- H=$1 +- flag=$2 +- test_expect_success "commit --$flag with $H encoding" ' +- git config i18n.commitencoding $H && +- git checkout -b $H-$flag C0 && +- echo $H >>F && +- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt && +- test_tick && +- echo intermediate stuff >>G && +- git add G && +- git commit -a -m "intermediate commit" && +- test_tick && +- echo $H $flag >>F && +- git commit -a --$flag HEAD~1 && +- E=$(git cat-file commit '$H-$flag' | +- sed -ne "s/^encoding //p") && +- test "z$E" = "z$H" && +- git config --unset-all i18n.commitencoding && +- git rebase --autosquash -i HEAD^^^ && +- git log --oneline >actual && +- test_line_count = 3 actual +- ' +-} +- +-test_commit_autosquash_flags eucJP fixup +- +-test_commit_autosquash_flags ISO-2022-JP squash +- + test_done +--- 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 @@ + git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG" + ' + +-cat >expected <<EOF +-author $SJIS_NAME +-summary $SJIS_MSG +-author $SJIS_NAME +-summary $SJIS_MSG +-author $SJIS_NAME +-summary $SJIS_MSG +-EOF +- + filter_author_summary () { + sed -n -e '/^author /p' -e '/^summary /p' "$@" + } + +-test_expect_success !MINGW \ +- 'blame respects i18n.commitencoding' ' +- git blame --incremental file >output && +- filter_author_summary output >actual && +- test_cmp expected actual +-' +- +-cat >expected <<EOF +-author $EUC_JAPAN_NAME +-summary $EUC_JAPAN_MSG +-author $EUC_JAPAN_NAME +-summary $EUC_JAPAN_MSG +-author $EUC_JAPAN_NAME +-summary $EUC_JAPAN_MSG +-EOF +- +-test_expect_success !MINGW \ +- 'blame respects i18n.logoutputencoding' ' +- git config i18n.logoutputencoding eucJP && +- git blame --incremental file >output && +- filter_author_summary output >actual && +- test_cmp expected actual +-' +- + cat >expected <<EOF + author $UTF8_NAME + summary $UTF8_MSG |