threads / patch / 21843

patch, 2 partst4201: use ISO8859-1 rather than ISO-8859-1

Subject: [PATCH 1/2] t4201: use ISO8859-1 rather than ISO-8859-1

## tl;dr

2 messages between Dec 3, 2009 and Dec 3, 2009. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Brandon Casey· Dec 3, 2009, 17:52 UTC · lore

From: Brandon Casey <drafnel@gmail.com>

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 <casey@nrlssc.navy.mil>
---
 t/t4201-shortlog.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to t/t4201-shortlog.sh +2 −2

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index dd818f6..a01e55b 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 &&

-- 
1.6.5.3

Brandon Casey· Dec 3, 2009, 17:52 UTC · re: Brandon Casey · lore

[PATCH 2/2] t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

From: Brandon Casey <drafnel@gmail.com>

The '--no-chain-reply-to' option is a Getopt::Long boolean option. The '--no-' prefix (as in --no-chain-reply-to) for boolean options is not supported in Getopt::Long version 2.32 which was released with Perl 5.8.0. This version only supports '--no' as in '--nochain-reply-to'. More recent versions of Getopt::Long, such as version 2.34, support either prefix. So use the older form in the tests.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
---
 t/t9001-send-email.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to t/t9001-send-email.sh +1 −1

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index fb51ab3..752adaa 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -827,7 +827,7 @@ test_expect_success 'no warning with an explicit --no-chain-reply-to' '
 	--dry-run \
 	--from="Example <nobody@example.com>" \
 	--to=nobody@example.com \
-	--no-chain-reply-to \
+	--nochain-reply-to \
 	outdir/000?-*.patch 2>errors >out &&
 	! grep "no-chain-reply-to" errors
 '

-- 
1.6.5.3