mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t3900: use ancient iconv names for backward compatibility
Some old iconv implementations do not have many alternate names and/or do not match character encoding names case insensitively. These implementations can not tell that utf-8 and UTF-8 are the same encoding and fail when trying to do the conversion. So use the old names, which modern implementations still support. The following conversions were performed: utf-8 --> UTF-8 ISO-8859-1 --> ISO8859-1 EUCJP --> eucJP Also update t9129 and t9500 which make use of the test files in t/t3900. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
99ddd24ad7
commit
5ae93dfdcc
|
@ -34,7 +34,7 @@ test_expect_success 'no encoding header for base case' '
|
|||
test z = "z$E"
|
||||
'
|
||||
|
||||
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" '
|
||||
git config i18n.commitencoding $H &&
|
||||
|
@ -44,7 +44,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 "check encoding header for $H" '
|
||||
E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") &&
|
||||
|
@ -61,14 +61,14 @@ test_expect_success 'config to remove customization' '
|
|||
else
|
||||
test z = "z$Z"
|
||||
fi &&
|
||||
git config i18n.commitencoding utf-8
|
||||
git config i18n.commitencoding UTF-8
|
||||
'
|
||||
|
||||
test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' '
|
||||
compare_with ISO-8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
|
||||
test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
|
||||
compare_with ISO8859-1 "$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 "$H should be shown in UTF-8 now" '
|
||||
compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
|
||||
|
@ -86,7 +86,7 @@ test_expect_success 'config to add customization' '
|
|||
fi
|
||||
'
|
||||
|
||||
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H should be shown in itself now" '
|
||||
git config i18n.commitencoding '$H' &&
|
||||
|
@ -95,21 +95,21 @@ do
|
|||
done
|
||||
|
||||
test_expect_success 'config to tweak customization' '
|
||||
git config i18n.logoutputencoding utf-8
|
||||
git config i18n.logoutputencoding UTF-8
|
||||
'
|
||||
|
||||
test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' '
|
||||
compare_with ISO-8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
|
||||
test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
|
||||
compare_with ISO8859-1 "$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 "$H should be shown in UTF-8 now" '
|
||||
compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
|
||||
'
|
||||
done
|
||||
|
||||
for J in EUCJP ISO-2022-JP
|
||||
for J in eucJP ISO-2022-JP
|
||||
do
|
||||
if test "$J" = ISO-2022-JP
|
||||
then
|
||||
|
@ -118,7 +118,7 @@ do
|
|||
ICONV=
|
||||
fi
|
||||
git config i18n.logoutputencoding $J
|
||||
for H in EUCJP ISO-2022-JP
|
||||
for H in eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H should be shown in $J now" '
|
||||
compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV
|
||||
|
@ -126,7 +126,7 @@ do
|
|||
done
|
||||
done
|
||||
|
||||
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "No conversion with $H" '
|
||||
compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt
|
||||
|
|
|
@ -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" '
|
||||
(
|
||||
|
|
|
@ -590,7 +590,7 @@ test_expect_success \
|
|||
echo "ISO-8859-1" >> file &&
|
||||
git add file &&
|
||||
git config i18n.commitencoding ISO-8859-1 &&
|
||||
git commit -F "$TEST_DIRECTORY"/t3900/ISO-8859-1.txt &&
|
||||
git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
|
||||
git config --unset i18n.commitencoding &&
|
||||
gitweb_run "p=.git;a=commit"'
|
||||
test_debug 'cat gitweb.log'
|
||||
|
|
Loading…
Reference in a new issue