Skip to content

Commit 952182b

Browse files
Ramsay Jonesgitster
authored andcommitted
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>
1 parent c6955fe commit 952182b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t9100-git-svn-basic.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55

66
test_description='git-svn basic tests'
7-
GIT_SVN_LC_ALL=$LC_ALL
7+
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
88

9-
case "$LC_ALL" in
9+
case "$GIT_SVN_LC_ALL" in
1010
*.UTF-8)
1111
have_utf8=t
1212
;;
@@ -17,7 +17,7 @@ esac
1717

1818
. ./lib-git-svn.sh
1919

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

2222
test_expect_success \
2323
'initialize git-svn' '
@@ -183,7 +183,7 @@ then
183183
git-svn set-tree HEAD"
184184
unset LC_ALL
185185
else
186-
echo "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
186+
say "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
187187
fi
188188

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

0 commit comments

Comments
 (0)