Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index 2848e46e38e1b664447e1ae8fc20d47c41e2acb5..8a9dde44d57b792d7142f082aa18274a13d532f3 100755 (executable)
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -16,7 +16,7 @@ compare_git_head_with () {
 
 compare_svn_head_with () {
        LC_ALL=en_US.UTF-8 svn log --limit 1 `git svn info --url` | \
-               sed -e 1,3d -e "/^-\+\$/d" >current &&
+               sed -e 1,3d -e "/^-\{1,\}\$/d" >current &&
        test_cmp current "$1"
 }
 
@@ -60,21 +60,25 @@ do
        '
 done
 
-test_expect_success 'ISO-8859-1 should match UTF-8 in svn' '
-(
-       cd ISO-8859-1 &&
-       compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
-)
-'
-
-for H in EUCJP ISO-2022-JP
-do
-       test_expect_success '$H should match UTF-8 in svn' '
+if locale -a |grep -q en_US.utf8; then
+       test_expect_success 'ISO-8859-1 should match UTF-8 in svn' '
        (
-               cd $H &&
-               compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+               cd ISO-8859-1 &&
+               compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
        )
        '
-done
+
+       for H in EUCJP ISO-2022-JP
+       do
+               test_expect_success '$H should match UTF-8 in svn' '
+               (
+                       cd $H &&
+                       compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+               )
+               '
+       done
+else
+       say "UTF-8 locale not available, test skipped"
+fi
 
 test_done