Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / t / t3900-i18n-commit.sh

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 3606ed2efa89be70e14848f9914bab93956d5ffb..ffddb68db3abbf1ab14bf99f3c9514a7ee0c276b 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -8,8 +8,8 @@ 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 &&
-       diff -u current "$2"
+       git-show -s $1 | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
+       git diff current "$2"
 }
 
 test_expect_success setup '
@@ -26,17 +26,17 @@ 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 &&
+               git-config i18n.commitencoding $H &&
                git-checkout -b $H C0 &&
                echo $H >F &&
                git-commit -a -F ../t3900/$H.txt
        '
 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") &&
@@ -44,32 +44,32 @@ do
        '
 done
 
-test_expect_success 'repo-config to remove customization' '
-       git-repo-config --unset-all i18n.commitencoding &&
-       if Z=$(git-repo-config --get-all i18n.commitencoding)
+test_expect_success 'config to remove customization' '
+       git-config --unset-all i18n.commitencoding &&
+       if Z=$(git-config --get-all i18n.commitencoding)
        then
                echo Oops, should have failed.
                false
        else
                test z = "z$Z"
        fi &&
-       git-repo-config i18n.commitencoding utf-8
+       git-config i18n.commitencoding utf-8
 '
 
 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
 
-test_expect_success 'repo-config to add customization' '
-       git-repo-config --unset-all i18n.commitencoding &&
-       if Z=$(git-repo-config --get-all i18n.commitencoding)
+test_expect_success 'config to add customization' '
+       git-config --unset-all i18n.commitencoding &&
+       if Z=$(git-config --get-all i18n.commitencoding)
        then
                echo Oops, should have failed.
                false
@@ -78,27 +78,45 @@ 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' &&
+               git-config i18n.commitencoding '$H' &&
                compare_with '$H' ../t3900/'$H'.txt
        '
 done
 
-test_expect_success 'repo-config to tweak customization' '
-       git-repo-config i18n.logoutputencoding utf-8
+test_expect_success 'config to tweak customization' '
+       git-config i18n.logoutputencoding utf-8
 '
 
 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-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