From 3994e8a98dc7bbf67e61d23c8125f44383499a1f Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Thu, 3 Dec 2009 11:52:45 -0600 Subject: [PATCH] t4201: use ISO8859-1 rather than ISO-8859-1 Some ancient platforms do not have an extensive list of alternate names for character encodings. For example, Solaris 7 and IRIX 6.5 do not know that ISO-8859-1 is the same as ISO8859-1. Modern platforms do know this, so use the older name. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- t/t4201-shortlog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index dd818f6fd..a01e55bf6 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -53,7 +53,7 @@ GIT_DIR=non-existing git shortlog -w < log > out test_expect_success 'shortlog from non-git directory' 'test_cmp expect out' iconvfromutf8toiso88591() { - printf "%s" "$*" | iconv -f UTF-8 -t ISO-8859-1 + printf "%s" "$*" | iconv -f UTF-8 -t ISO8859-1 } DSCHO="Jöhännës \"Dschö\" Schindëlin" @@ -72,7 +72,7 @@ test_expect_success 'shortlog encoding' ' git config --unset i18n.commitencoding && echo 2 > a1 && git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 && - git config i18n.commitencoding "ISO-8859-1" && + git config i18n.commitencoding "ISO8859-1" && echo 3 > a1 && git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \ --author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 && -- 2.11.0