[PATCH] t9139 uses ancient, backwards-compatible iconv names
This is needed to work with
5ae93dfdccfe9457bdb1f54b33c76359f6c3b861:
t3900: use ancient iconv names for backward compatibility
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
Brandon Casey <casey@nrlssc.navy.mil> wrote:
> Junio C Hamano wrote:
> > Eric Wong <normalperson@yhbt.net> writes:
> >
> >> t/t9139-git-svn-non-utf8-commitencoding.sh | 47 ++++++++++++++++++++++++++++
> >
> > Hmm.
> >
> >> +# Copyright (c) 2009 Eric Wong
> >> +
> >> +test_description='git svn refuses to dcommit non-UTF8 messages'
> >> +
> >> +. ./lib-git-svn.sh
> >
> > This passes when merged to 'master', but together with bc/old-iconv branch
> > cooking in 'next' it breaks.
>
> Yeah, it's the second for loop which accesses the files in t/t3900/.
> bc/old-iconv replaces each occurrence of ISO-8859-1 with ISO8859-1
> and EUCJP with eucJP since old Solaris didn't know both names and
> modern platforms handle either name. The text files in t/t3900/
> were renamed accordingly.
>
> It would be nice to use these older names here too, even though I
> won't be able to test it since svn is not installed on the older
> platforms I have access to.
t/t9139-git-svn-non-utf8-commitencoding.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t9139-git-svn-non-utf8-commitencoding.sh b/t/t9139-git-svn-non-utf8-commitencoding.sh
index 2b1db97..f337959 100755
--- a/t/t9139-git-svn-non-utf8-commitencoding.sh
+++ b/t/t9139-git-svn-non-utf8-commitencoding.sh
@@ -8,7 +8,7 @@ test_description='git svn refuses to dcommit non-UTF8 messages'
# ISO-2022-JP can pass for valid UTF-8, so skipping that in this test
-for H in ISO-8859-1 EUCJP
+for H in ISO8859-1 eucJP
do
test_expect_success "$H setup" '
mkdir $H &&
@@ -17,7 +17,7 @@ do
'
done
-for H in ISO-8859-1 EUCJP
+for H in ISO8859-1 eucJP
do
test_expect_success "$H commit on git side" '
(
@@ -33,7 +33,7 @@ do
'
done
-for H in ISO-8859-1 EUCJP
+for H in ISO8859-1 eucJP
do
test_expect_success "$H dcommit to svn" '
(
--
Eric Wong