t8005: use more portable character encoding names
authorBrandon Casey <casey@nrlssc.navy.mil>
Fri, 22 May 2009 23:47:05 +0000 (18:47 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 05:40:22 +0000 (22:40 -0700)
Some platforms do not have an extensive list of alternate names for
character encodings.

Solaris 7 does not know about shift-jis, but does know SJIS.  It also does
not know that utf-8 and UTF-8 refer to the same encoding.

With the above in mind, the following conversions were performed:

      utf-8 --> UTF-8
  shift-jis --> SJIS

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t8005-blame-i18n.sh

index fcd5c266754a2b5de3dbbf94c8ef25aebff061f2..75cbced224b2b23d498508d23eeaa7d451bb2452 100755 (executable)
@@ -20,7 +20,7 @@ test_expect_success 'setup the repository' '
 
        echo "SJIS LINE" >> file &&
        git add file &&
-       git config i18n.commitencoding shift-jis &&
+       git config i18n.commitencoding SJIS &&
        git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
 '
 
@@ -67,8 +67,8 @@ summary $UTF8_MSG
 EOF
 
 test_expect_success \
-       'blame respects --encoding=utf-8' '
-       git blame --incremental --encoding=utf-8 file | \
+       'blame respects --encoding=UTF-8' '
+       git blame --incremental --encoding=UTF-8 file | \
                egrep "^(author|summary) " > actual &&
        test_cmp actual expected
 '