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

Subsystems: the rest

DORMANTno replies

2 messages, 1 author, 2016-06-15 · open the first message on its own page

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

From: Brandon Casey <hidden>
Date: 2016-06-15 22:47:49

From: Brandon Casey <redacted>

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

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

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

From: Brandon Casey <hidden>
Date: 2016-06-15 22:47:49

From: Brandon Casey <redacted>

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 <redacted>
---
 t/t9001-send-email.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help