Merge branch 'maint'

* maint:
t8005: Nobody writes Russian in shift_jis

Conflicts:
t/t8005-blame-i18n.sh

diff --combined t/t8005-blame-i18n.sh
index 9cca14d080e63d25f5d71179deaced8b226bba07,9c1e21a60be83322c67c7586a86d2410b472be7b..cb390559f947fe3cd89a99b9bd473d60c7083307
--- 1/t/t8005-blame-i18n.sh
--- 2/t/t8005-blame-i18n.sh
+++ b/t/t8005-blame-i18n.sh
@@@ -4,7 -4,7 +4,7 @@@ test_description='git blame encoding co
  . ./test-lib.sh
  
  . "$TEST_DIRECTORY"/t8005/utf8.txt
- . "$TEST_DIRECTORY"/t8005/iso8859-5.txt
+ . "$TEST_DIRECTORY"/t8005/euc-japan.txt
  . "$TEST_DIRECTORY"/t8005/sjis.txt
  
  test_expect_success 'setup the repository' '
@@@ -13,14 -13,14 +13,14 @@@
        git add file &&
        git commit --author "$UTF8_NAME <utf8@localhost>" -m "$UTF8_MSG" &&
  
-       echo "ISO-8859-5 LINE" >> file &&
+       echo "EUC-JAPAN LINE" >> file &&
        git add file &&
-       git config i18n.commitencoding ISO8859-5 &&
-       git commit --author "$ISO8859_5_NAME <iso8859-5@localhost>" -m "$ISO8859_5_MSG" &&
+       git config i18n.commitencoding eucJP &&
+       git commit --author "$EUC_JAPAN_NAME <euc-japan@localhost>" -m "$EUC_JAPAN_MSG" &&
  
        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"
  '
  
@@@ -41,17 -41,17 +41,17 @@@ test_expect_success 
  '
  
  cat >expected <<EOF
- author $ISO8859_5_NAME
- summary $ISO8859_5_MSG
- author $ISO8859_5_NAME
- summary $ISO8859_5_MSG
- author $ISO8859_5_NAME
- summary $ISO8859_5_MSG
+ 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 \
        'blame respects i18n.logoutputencoding' '
-       git config i18n.logoutputencoding ISO8859-5 &&
+       git config i18n.logoutputencoding eucJP &&
        git blame --incremental file | \
                egrep "^(author|summary) " > actual &&
        test_cmp actual expected
@@@ -67,8 -67,8 +67,8 @@@ summary $UTF8_MS
  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
  '
@@@ -76,8 -76,8 +76,8 @@@
  cat >expected <<EOF
  author $SJIS_NAME
  summary $SJIS_MSG
- author $ISO8859_5_NAME
- summary $ISO8859_5_MSG
+ author $EUC_JAPAN_NAME
+ summary $EUC_JAPAN_MSG
  author $UTF8_NAME
  summary $UTF8_MSG
  EOF