aboutsummaryrefslogtreecommitdiff
path: root/t/t9129-git-svn-i18n-commitencoding.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-05-29 17:14:47 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-30 22:30:55 -0700
commit188643140bdcc5c8b7029058da87510cf1aeff50 (patch)
tree25fe03a1303c1047e3b703650715e31f1da398cf /t/t9129-git-svn-i18n-commitencoding.sh
parent0ddbbb66614c7a503442ff863817ccbc68f417ab (diff)
parented43bc8c4c30199cfba5e6ce9f8037c8c454cf5c (diff)
downloadgit-188643140bdcc5c8b7029058da87510cf1aeff50.tar.gz
git-188643140bdcc5c8b7029058da87510cf1aeff50.tar.xz
t9139 uses ancient, backwards-compatible iconv names
This resolves a semantic conflicts early to work with 5ae93df (t3900: use ancient iconv names for backward compatibility, 2009-05-18). Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9129-git-svn-i18n-commitencoding.sh')
-rwxr-xr-xt/t9129-git-svn-i18n-commitencoding.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index d45fb7301..b9224bdb2 100755
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -29,7 +29,7 @@ compare_svn_head_with () {
test_cmp current "$1"
}
-for H in ISO-8859-1 EUCJP ISO-2022-JP
+for H in ISO8859-1 eucJP ISO-2022-JP
do
test_expect_success "$H setup" '
mkdir $H &&
@@ -38,7 +38,7 @@ do
'
done
-for H in ISO-8859-1 EUCJP ISO-2022-JP
+for H in ISO8859-1 eucJP ISO-2022-JP
do
test_expect_success "$H commit on git side" '
(
@@ -55,7 +55,7 @@ do
'
done
-for H in ISO-8859-1 EUCJP ISO-2022-JP
+for H in ISO8859-1 eucJP ISO-2022-JP
do
test_expect_success "$H dcommit to svn" '
(
@@ -77,12 +77,12 @@ fi
test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' '
(
- cd ISO-8859-1 &&
+ cd ISO8859-1 &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
)
'
-for H in EUCJP ISO-2022-JP
+for H in eucJP ISO-2022-JP
do
test_expect_success UTF8 "$H should match UTF-8 in svn" '
(