[PATCH] Use UTF-8 instead of utf8 for backward compatibility
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- May 14, 2009, 13:05 UTC
- Message-ID
- <81b0412b0905140605o21143369ibc3147c6619c7845@mail.gmail.com>
An old iconv (GNU libiconv 1.11) does not know about utf8, it does know UTF-8 though, which is also understood by all newer iconv implementations.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> ---
2009/5/12 Junio C Hamano <gitster@pobox.com>:
Show 13 quoted lines
> --- a/t/t3900-i18n-commit.sh
> +++ b/t/t3900-i18n-commit.sh
> @@ -9,7 +9,15 @@ test_description='commit and log output encodings'
>
> compare_with () {
> git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' >current &&
> - test_cmp current "$2"
> + case "$3" in
> + '')
> + test_cmp "$2" current ;;
> + ?*)
> + iconv -f "$3" -t utf8 >current.utf8 <current &&
> + iconv -f "$3" -t utf8 >expect.utf8 <"$2" &&I happen to have an old one (Cygwin): $ iconv --version iconv (GNU libiconv 1.11)
t/t3900-i18n-commit.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index 5dbbcb6..b4ec2b5 100755 --- a/t/t3900-i18n-commit.sh +++ b/t/t3900-i18n-commit.sh @@ -13,8 +13,8 @@ compare_with () { '') test_cmp "$2" current ;; ?*) - iconv -f "$3" -t utf8 >current.utf8 <current && - iconv -f "$3" -t utf8 >expect.utf8 <"$2" && + iconv -f "$3" -t UTF-8 >current.utf8 <current && + iconv -f "$3" -t UTF-8 >expect.utf8 <"$2" && test_cmp expect.utf8 current.utf8 ;; esac
--
1.6.3.49.ge312c
From bb9dd160d93cb6753ab08dbc29c6ee840cfd06bc Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 14 May 2009 14:55:54 +0200
Subject: [PATCH] Use UTF-8 instead of utf8 for backward compatibility
An old iconv (GNU libiconv 1.11) does not know about utf8, it does know
UTF-8 though, which is also understood by all newer iconv implementations.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
t/t3900-i18n-commit.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 5dbbcb6..b4ec2b5 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -13,8 +13,8 @@ compare_with () {
'')
test_cmp "$2" current ;;
?*)
- iconv -f "$3" -t utf8 >current.utf8 <current &&
- iconv -f "$3" -t utf8 >expect.utf8 <"$2" &&
+ iconv -f "$3" -t UTF-8 >current.utf8 <current &&
+ iconv -f "$3" -t UTF-8 >expect.utf8 <"$2" &&
test_cmp expect.utf8 current.utf8
;;
esac
--
1.6.3.49.ge312c