t9100-git-svn-basic.sh: Fix determination of utf-8 locale

When setting the GIT_SVN_LC_ALL variable, default to the $LANG
environment variable, when the $LC_ALL override is not set.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 242cdf092acdbfc88858de1dbcfe3c817a67a4c2..3bc6164125f683d26213035ee9b1ea9199be5792 100755 (executable)
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -4,9 +4,9 @@
 #
 
 test_description='git-svn basic tests'
 #
 
 test_description='git-svn basic tests'

-GIT_SVN_LC_ALL=$LC_ALL
+GIT_SVN_LC_ALL=${LC_ALL:-$LANG}

 
 

-case "$LC_ALL" in
+case "$GIT_SVN_LC_ALL" in

 *.UTF-8)
        have_utf8=t
        ;;
 *.UTF-8)
        have_utf8=t
        ;;


@@ -17,7 +17,7 @@ esac
 
 . ./lib-git-svn.sh
 
 
 . ./lib-git-svn.sh
 

-echo 'define NO_SVN_TESTS to skip git-svn tests'
+say 'define NO_SVN_TESTS to skip git-svn tests'

 
 test_expect_success \
     'initialize git-svn' '
 
 test_expect_success \
     'initialize git-svn' '


@@ -183,7 +183,7 @@ then
                git-svn set-tree HEAD"
        unset LC_ALL
 else
                git-svn set-tree HEAD"
        unset LC_ALL
 else

-       echo "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
+       say "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"

 fi
 
 name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
 fi
 
 name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'