diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 02:16:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 02:16:25 -0700 |
| commit | 6517452d7a4269e9a34648a28b8931640299f458 (patch) | |
| tree | 8c9dabf3ae1ed7c974b78fb4ce0547557fc46358 | |
| parent | 8f5e3ca7d1d9c987c5a50934f1acdbad44163f3b (diff) | |
| parent | 54bc13ce5300bf7c2237aba3fd123dd587e56d31 (diff) | |
| download | git-6517452d7a4269e9a34648a28b8931640299f458.tar.gz | |
Merge branch 'maint'
* maint:
t8005: Nobody writes Russian in shift_jis
Conflicts:
t/t8005-blame-i18n.sh
| -rwxr-xr-x | t/t8005-blame-i18n.sh | 26 | ||||
| -rw-r--r-- | t/t8005/euc-japan.txt | 2 | ||||
| -rw-r--r-- | t/t8005/sjis.txt | 4 | ||||
| -rw-r--r-- | t/t8005/utf8.txt | 4 |
4 files changed, 19 insertions, 17 deletions
diff --git a/t/t8005-blame-i18n.sh b/t/t8005-blame-i18n.sh index 9cca14d080..cb390559f9 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/iso8859-5.txt +. "$TEST_DIRECTORY"/t8005/euc-japan.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 <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 && @@ -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 @@ -76,8 +76,8 @@ test_expect_success \ 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 diff --git a/t/t8005/euc-japan.txt b/t/t8005/euc-japan.txt new file mode 100644 index 0000000000..288f040c99 --- /dev/null +++ b/t/t8005/euc-japan.txt @@ -0,0 +1,2 @@ +EUC_JAPAN_NAME="山田 太郎" +EUC_JAPAN_MSG="ブレームのテストです。" diff --git a/t/t8005/sjis.txt b/t/t8005/sjis.txt index 2ccfbad207..bbdefeaced 100644 --- a/t/t8005/sjis.txt +++ b/t/t8005/sjis.txt @@ -1,2 +1,2 @@ -SJIS_NAME="Irp~ Pury Rytr" -SJIS_MSG="Suru qu~yu" +SJIS_NAME="Rc Y" +SJIS_MSG="u[eXgB" diff --git a/t/t8005/utf8.txt b/t/t8005/utf8.txt index f46cfc56d8..4d00dbea76 100644 --- a/t/t8005/utf8.txt +++ b/t/t8005/utf8.txt @@ -1,2 +1,2 @@ -UTF8_NAME="于舒仆 亠仂于亳 弌亳亟仂仂于" -UTF8_MSG="丐亠仂于仂亠 仂仂弍亠仆亳亠" +UTF8_NAME="絮援 紊" +UTF8_MSG="若鴻с" |