The tested encoding is always available in a variable. Use it instead of
hardcoding. Also, to be in line with other tests use ISO8859-1
(uppercase) rather then iso8895-1.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff-submodule-option.sh | 7 +--
t/t4205-log-pretty-formats.sh| 11 +++
t/t6006-rev-list-format.sh | 35 +++
t/t7102-reset.sh | 13 -
4 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 1751c83..463d63b 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -11,6 +11,9 @@ This test tries to verify the sanity of the --submodule
option of git diff.
. ./test-lib.sh
+# Tested non-UTF-8 encoding
+test_encoding=ISO8859-1
+
# String added in German (translated with Google Translate), encoded in
UTF-8,
# used in sample commit log messages in add_file() function below.
added=$(printf hinzugef\303\274gt)
@@ -23,8 +26,8 @@ add_file () {
echo $name $name
git add $name
test_tick
- msg_added_iso88591=$(echo Add $name ($added $name) |
iconv -f utf-8 -t iso8859-1)
- git -c 'i18n.commitEncoding=iso8859-1' commit -m
$msg_added_iso88591
+ msg_added_iso88591=$(echo Add $name ($added $name) |
iconv -f utf-8 -t $test_encoding)
+ git -c i18n.commitEncoding=$test_encoding commit -m
$msg_added_iso88591
done /dev/null
git rev-parse --short --verify HEAD
)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index f9f33ae..f5ea3f8 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -7,6 +7,9 @@
test_description='Test pretty formats'
. ./test-lib.sh
+# Tested non-UTF-8 encoding
+test_encoding=ISO8859-1
+
sample_utf8_part=$(printf f\303\244ng)
commit_msg () {
@@ -27,8 +30,8 @@ test_expect_success 'set up basic repos' '
bar
git add foo
test_tick
- git config i18n.commitEncoding iso8859-1
- git commit -m $(commit_msg iso8859-1)
+ git config i18n.commitEncoding $test_encoding
+ git commit -m $(commit_msg $test_encoding)
git add bar
test_tick
git commit -m add bar
@@ -56,8 +59,8 @@ test_expect_success 'alias user-defined format' '
test_cmp expected actual
'
-test_expect_success 'alias user-defined tformat with %s (iso8859-1 encoding)' '
- git config i18n.logOutputEncoding iso8859-1
+test_expect_success 'alias user-defined tformat with %s (ISO8859-1 encoding)' '
+ git config i18n.logOutputEncoding $test_encoding
git log --oneline expected-s
git log --pretty=tformat:%h %s actual-s
git config --unset i18n.logOutputEncoding
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 9874403..9e4ba62 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -9,19 +9,22 @@ test_description='git rev-list --pretty=format test'
. $TEST_DIRECTORY/lib-terminal.sh
test_tick
+# Tested non-UTF-8 encoding
+test_encoding=ISO8859-1
+
# String added in German
# (translated with Google Translate),
# encoded in UTF-8, used as a commit log message below.
added=$(printf added (hinzugef\303\274gt) foo)
-added_iso88591=$(echo $added | iconv -f utf-8 -t iso8859-1)
+added_iso88591=$(echo $added | iconv -f utf-8 -t $test_encoding)
# same but changed
changed=$(printf changed (ge\303\244ndert) foo)
-changed_iso88591=$(echo $changed | iconv -f utf-8 -t iso8859-1)
+changed_iso88591=$(echo $changed | iconv -f utf-8 -t $test_encoding)
test_expect_success 'setup' '
: foo
git add foo
- git config i18n.commitEncoding iso8859-1
+ git config i18n.commitEncoding $test_encoding
git commit -m $added_iso88591
head1=$(git rev-parse --verify HEAD)
head1_short=$(git rev-parse --verify --short $head1)
@@ -124,9 +127,9 @@ EOF
test_format encoding %e EOF
commit $head2
-iso8859-1
+$test_encoding
commit $head1
-iso8859-1
+$test_encoding
EOF
test_format subject %s EOF
@@ -206,16 +209,16 @@ test_expect_success '%C(auto) respects --color=auto
(stdout not tty)' '
)
'
-iconv -f utf-8 -t iso8859-1 commit-msg EOF
+iconv -f utf-8 -t $test_encoding commit-msg EOF
Test printing of complex bodies
This commit message is much longer than the others,
-and it will be encoded in iso8859-1. We should therefore
-include an iso8859 character: ¡bueno!
+and it will be encoded in $test_encoding. We should therefore
+include an ISO8859 character: ¡bueno!
EOF
test_expect_success 'setup complex body' '
- git config i18n.commitencoding iso8859-1
+ git config i18n.commitencoding $test_encoding
echo change2 foo git
