t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1
Both "iso8859-1" and "iso-8859-1" are understood as latin-1 by modern platforms, but the latter is not understood by older platforms;update tests to use the former. This is in line with 3994e8a9 (t4201: use ISO8859-1 rather than ISO-8859-1, 2009-12-03), which did the same. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alexey Shumkin committed
Jul 4, 2013 at 16:45 UTC
14332bccc1d88e89fa8950b92c034432e1585bd4
4 files changed
+18
-18
t/t4041-diff-submodule-option.sh
+2
-2
@@ -23,8 +23,8 @@ add_file () {
23
echo "$name" >"$name" &&
24
git add "$name" &&
25
test_tick &&
26
- msg_added_iso88591=$(echo "Add $name ($added $name)" | iconv -f utf-8 -t iso-8859-1) &&
27
- git -c 'i18n.commitEncoding=iso-8859-1' commit -m "$msg_added_iso88591"
26
+ msg_added_iso88591=$(echo "Add $name ($added $name)" | iconv -f utf-8 -t iso8859-1) &&
27
+ git -c 'i18n.commitEncoding=iso8859-1' commit -m "$msg_added_iso88591"
28
done >/dev/null &&
29
git rev-parse --short --verify HEAD
30
)
t/t4205-log-pretty-formats.sh
+4
-4
@@ -32,8 +32,8 @@ test_expect_success 'set up basic repos' '
32
>bar &&
33
git add foo &&
34
test_tick &&
35
- git config i18n.commitEncoding iso-8859-1 &&
36
- git commit -m "$(commit_msg iso-8859-1)" &&
35
+ git config i18n.commitEncoding iso8859-1 &&
36
+ git commit -m "$(commit_msg iso8859-1)" &&
37
git add bar &&
38
test_tick &&
39
git commit -m "add bar" &&
@@ -61,8 +61,8 @@ test_expect_success 'alias user-defined format' '
61
test_cmp expected actual
62
'
63
64
-test_expect_success 'alias user-defined tformat with %s (iso-8859-1 encoding)' '
65
- git config i18n.logOutputEncoding iso-8859-1 &&
64
+test_expect_success 'alias user-defined tformat with %s (iso8859-1 encoding)' '
65
+ git config i18n.logOutputEncoding iso8859-1 &&
66
git log --oneline >expected-s &&
67
git log --pretty="tformat:%h %s" >actual-s &&
68
git config --unset i18n.logOutputEncoding &&
t/t6006-rev-list-format.sh
+7
-7
@@ -12,15 +12,15 @@ test_tick
12
# String "added" in German (translated with Google Translate), encoded in UTF-8,
13
# used as a commit log message below.
14
added=$(printf "added (hinzugef\303\274gt) foo")
15
-added_iso88591=$(echo "$added" | iconv -f utf-8 -t iso-8859-1)
15
+added_iso88591=$(echo "$added" | iconv -f utf-8 -t iso8859-1)
16
# same but "changed"
17
changed=$(printf "changed (ge\303\244ndert) foo")
18
-changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t iso-8859-1)
18
+changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t iso8859-1)
19
20
test_expect_success 'setup' '
21
: >foo &&
22
git add foo &&
23
- git config i18n.commitEncoding iso-8859-1 &&
23
+ git config i18n.commitEncoding iso8859-1 &&
24
git commit -m "$added_iso88591" &&
25
head1=$(git rev-parse --verify HEAD) &&
26
head1_short=$(git rev-parse --verify --short $head1) &&
@@ -136,9 +136,9 @@ EOF
136
137
test_format encoding %e <<EOF
138
commit $head2
139
-iso-8859-1
139
+iso8859-1
140
commit $head1
141
-iso-8859-1
141
+iso8859-1
142
EOF
143
144
test_format subject %s <<EOF
@@ -242,9 +242,9 @@ test_format complex-encoding %e <<EOF
242
commit $head3
243
iso8859-1
244
commit $head2
245
-iso-8859-1
245
+iso8859-1
246
commit $head1
247
-iso-8859-1
247
+iso8859-1
248
EOF
249
250
test_format complex-subject %s <<EOF
t/t7102-reset.sh
+5
-5
@@ -39,7 +39,7 @@ test_expect_success 'creating initial files and commits' '
39
40
echo "1st line 2nd file" >secondfile &&
41
echo "2nd line 2nd file" >>secondfile &&
42
- git -c "i18n.commitEncoding=iso-8859-1" commit -a -m "$(commit_msg iso-8859-1)" &&
42
+ git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
43
head5=$(git rev-parse --verify HEAD)
44
'
45
# git log --pretty=oneline # to see those SHA1 involved
@@ -62,10 +62,10 @@ test_expect_success 'reset --hard message' '
62
test_cmp .expected .actual
63
'
64
65
-test_expect_success 'reset --hard message (iso-8859-1 logoutencoding)' '
65
+test_expect_success 'reset --hard message (iso8859-1 logoutputencoding)' '
66
hex=$(git log -1 --format="%h") &&
67
- git -c "i18n.logOutputEncoding=iso-8859-1" reset --hard > .actual &&
68
- echo HEAD is now at $hex $(commit_msg iso-8859-1) > .expected &&
67
+ git -c "i18n.logOutputEncoding=iso8859-1" reset --hard > .actual &&
68
+ echo HEAD is now at $hex $(commit_msg iso8859-1) > .expected &&
69
test_cmp .expected .actual
70
'
71
@@ -329,7 +329,7 @@ test_expect_success 'redoing the last two commits should succeed' '
329
330
echo "1st line 2nd file" >secondfile &&
331
echo "2nd line 2nd file" >>secondfile &&
332
- git -c "i18n.commitEncoding=iso-8859-1" commit -a -m "$(commit_msg iso-8859-1)" &&
332
+ git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
333
check_changes $head5
334
'
335