[PATCH] t9100-git-svn-basic.sh: Fix determination of utf-8 locale
From: Ramsay Jones <hidden>
Date: 2016-06-15 22:44:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- It took some time before I noticed this because the message "UTF-8 locale not set, ..." did not stand-out when flying past on the console. After noticing it, however, it surprised me (then irritated me) because I most definitely did have a UTF-8 locale set ... The two hunks which s/echo/say/ are not strictly part of the fix and should perhaps be in a separate patch ... Dunno. (but it certainly makes the message stand out more ;-) t/t9100-git-svn-basic.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 242cdf0..3bc6164 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'
--
1.5.6