Merge branch 'maint' to sync with 1.7.2.2

diff --git a/t/t9139-git-svn-non-utf8-commitencoding.sh b/t/t9139-git-svn-non-utf8-commitencoding.sh
index 2b1db9733708e885aa7c12db9fa8b03a6799326a..22d80b0be2b94515132a79401b719f98794f4616 100755 (executable)
--- a/t/t9139-git-svn-non-utf8-commitencoding.sh
+++ b/t/t9139-git-svn-non-utf8-commitencoding.sh
@@ -8,7 +8,7 @@ test_description='git svn refuses to dcommit non-UTF8 messages'
 
 # ISO-2022-JP can pass for valid UTF-8, so skipping that in this test
 
-for H in ISO-8859-1 EUCJP
+for H in ISO8859-1 eucJP
 do
        test_expect_success "$H setup" '
                mkdir $H &&
@@ -17,7 +17,7 @@ do
        '
 done
 
-for H in ISO-8859-1 EUCJP
+for H in ISO8859-1 eucJP
 do
        test_expect_success "$H commit on git side" '
        (
@@ -33,13 +33,13 @@ do
        '
 done
 
-for H in ISO-8859-1 EUCJP
+for H in ISO8859-1 eucJP
 do
        test_expect_success "$H dcommit to svn" '
        (
                cd $H &&
                git config --unset i18n.commitencoding &&
-               ! git svn dcommit
+               test_must_fail git svn dcommit
        )
        '
 done