Skip to content

Commit

Permalink
t8005: convert CP1251 character set to ISO8859-5
Browse files Browse the repository at this point in the history
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 <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brandon Casey authored and Junio C Hamano committed May 23, 2009
1 parent bdb0a7e commit bb43414
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
26 changes: 13 additions & 13 deletions t/t8005-blame-i18n.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
Expand All @@ -13,10 +13,10 @@ test_expect_success 'setup the repository' '
git add file &&
git commit --author "$UTF8_NAME <utf8@localhost>" -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 <cp1251@localhost>" -m "$CP1251_MSG" &&
git config i18n.commitencoding ISO8859-5 &&
git commit --author "$ISO8859_5_NAME <iso8859-5@localhost>" -m "$ISO8859_5_MSG" &&
echo "SJIS LINE" >> file &&
git add file &&
Expand All @@ -41,17 +41,17 @@ test_expect_success \
'

cat >expected <<EOF
author $CP1251_NAME
summary $CP1251_MSG
author $CP1251_NAME
summary $CP1251_MSG
author $CP1251_NAME
summary $CP1251_MSG
author $ISO8859_5_NAME
summary $ISO8859_5_MSG
author $ISO8859_5_NAME
summary $ISO8859_5_MSG
author $ISO8859_5_NAME
summary $ISO8859_5_MSG
EOF

test_expect_success \
'blame respects i18n.logoutputencoding' '
git config i18n.logoutputencoding cp1251 &&
git config i18n.logoutputencoding ISO8859-5 &&
git blame --incremental file | \
egrep "^(author|summary) " > actual &&
test_cmp actual expected
Expand All @@ -76,8 +76,8 @@ test_expect_success \
cat >expected <<EOF
author $SJIS_NAME
summary $SJIS_MSG
author $CP1251_NAME
summary $CP1251_MSG
author $ISO8859_5_NAME
summary $ISO8859_5_MSG
author $UTF8_NAME
summary $UTF8_MSG
EOF
Expand Down
2 changes: 0 additions & 2 deletions t/t8005/cp1251.txt

This file was deleted.

2 changes: 2 additions & 0 deletions t/t8005/iso8859-5.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ISO8859_5_NAME="���� �������� �������"
ISO8859_5_MSG="�������� ���������"

0 comments on commit bb43414

Please sign in to comment.