From: Brandon Casey Date: Fri, 22 May 2009 23:47:06 GMT Subject: [PATCH 2/2] t8005: convert CP1251 character set to ISO8859-5 Message-ID: In-Reply-To: On IRIX 6.5 CP1251 is unknown, but WIN1251 (which seems to be a non-standard name) is known. On Solaris 10, the opposite is true. Solaris also knows CP1251 as WINDOWS-1251, but this too is not recognized on IRIX. I could not find a name that both platforms recognized for this character set. An alternative character set which covers the same alphabet seems to be the ISO8859-5 character set. Both platforms support this character set, so use it instead. This allows t8005.4 to pass on Solaris 7, and part of the test to pass on IRIX. (My IRIX can't convert SJIS to UTF-8 :( Signed-off-by: Brandon Casey --- This should still provide the same breadth of testing: a russian code set, a japanese code set, and unicode. Wikipedia says that ISO8859-5 is not as commonly used as either CP1251 or KOI8-R, but it is available on these old platforms. You'd think that if Solaris 7 has it _and_ IRIX has it, then everything else would too, but still feel free to drop this anyway. Neither of those platforms, or Solaris 10 (for me) can convert between any of the russian and japanese encodings, so t8005.[23] still fail, and I doubt there is any hope. -brandon t/t8005-blame-i18n.sh | 26 +++++++++++++------------- t/t8005/cp1251.txt | 2 -- t/t8005/iso8859-5.txt | 2 ++ 3 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 t/t8005/cp1251.txt create mode 100644 t/t8005/iso8859-5.txt diff --git a/t/t8005-blame-i18n.sh b/t/t8005-blame-i18n.sh index 75cbced..4460975 100755 --- a/t/t8005-blame-i18n.sh +++ b/t/t8005-blame-i18n.sh @@ -4,7 +4,7 @@ test_description='git blame encoding conversion' . ./test-lib.sh . "$TEST_DIRECTORY"/t8005/utf8.txt -. "$TEST_DIRECTORY"/t8005/cp1251.txt +. "$TEST_DIRECTORY"/t8005/iso8859-5.txt . "$TEST_DIRECTORY"/t8005/sjis.txt test_expect_success 'setup the repository' ' @@ -13,10 +13,10 @@ test_expect_success 'setup the repository' ' git add file && git commit --author "$UTF8_NAME " -m "$UTF8_MSG" && - echo "CP1251 LINE" >> file && + echo "KOI8-R LINE" >> file && git add file && - git config i18n.commitencoding cp1251 && - git commit --author "$CP1251_NAME " -m "$CP1251_MSG" && + git config i18n.commitencoding ISO8859-5 && + git commit --author "$ISO8859_5_NAME " -m "$ISO8859_5_MSG" && echo "SJIS LINE" >> file && git add file && @@ -41,17 +41,17 @@ test_expect_success \ ' cat >expected < actual && test_cmp actual expected @@ -76,8 +76,8 @@ test_expect_success \ cat >expected <