From 952182b5691452f2b4fb49513c74e856d561f9d2 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Tue, 8 Jul 2008 23:59:25 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t9100-git-svn-basic.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 242cdf092a..3bc6164125 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -4,9 +4,9 @@ # 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 ;; @@ -17,7 +17,7 @@ esac . ./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' ' @@ -183,7 +183,7 @@ then 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' -- 2.11.4.GIT