More tests in t3901.

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 3606ed2efa89be70e14848f9914bab93956d5ffb..6714b0dd6e6164eb17174465be536ee3a07d88e1 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -8,7 +8,7 @@ test_description='commit and log output encodings'
 . ./test-lib.sh
 
 compare_with () {
-       git-show -s "$1" | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
+       git-show -s $1 | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
        diff -u current "$2"
 }
 
@@ -26,7 +26,7 @@ test_expect_success 'no encoding header for base case' '
        test z = "z$E"
 '
 
-for H in ISO-8859-1 EUCJP ISO2022JP
+for H in ISO-8859-1 EUCJP ISO-2022-JP
 do
        test_expect_success "$H setup" '
                git-repo-config i18n.commitencoding $H &&
@@ -36,7 +36,7 @@ do
        '
 done
 
-for H in ISO-8859-1 EUCJP ISO2022JP
+for H in ISO-8859-1 EUCJP ISO-2022-JP
 do
        test_expect_success "check encoding header for $H" '
                E=$(git-cat-file commit '$H' | sed -ne "s/^encoding //p") &&
@@ -60,7 +60,7 @@ test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' '
        compare_with ISO-8859-1 ../t3900/1-UTF-8.txt
 '
 
-for H in EUCJP ISO2022JP
+for H in EUCJP ISO-2022-JP
 do
        test_expect_success "$H should be shown in UTF-8 now" '
                compare_with '$H' ../t3900/2-UTF-8.txt
@@ -78,7 +78,7 @@ test_expect_success 'repo-config to add customization' '
        fi
 '
 
-for H in ISO-8859-1 EUCJP ISO2022JP
+for H in ISO-8859-1 EUCJP ISO-2022-JP
 do
        test_expect_success "$H should be shown in itself now" '
                git-repo-config i18n.commitencoding '$H' &&
@@ -94,11 +94,29 @@ test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' '
        compare_with ISO-8859-1 ../t3900/1-UTF-8.txt
 '
 
-for H in EUCJP ISO2022JP
+for H in EUCJP ISO-2022-JP
 do
        test_expect_success "$H should be shown in UTF-8 now" '
                compare_with '$H' ../t3900/2-UTF-8.txt
        '
 done
 
+for J in EUCJP ISO-2022-JP
+do
+       git-repo-config i18n.logoutputencoding $J
+       for H in EUCJP ISO-2022-JP
+       do
+               test_expect_success "$H should be shown in $J now" '
+                       compare_with '$H' ../t3900/'$J'.txt
+               '
+       done
+done
+
+for H in ISO-8859-1 EUCJP ISO-2022-JP
+do
+       test_expect_success "No conversion with $H" '
+               compare_with "--encoding=none '$H'" ../t3900/'$H'.txt
+       '
+done
+
 test_done