mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
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>
This commit is contained in:
parent
7c37521487
commit
14332bccc1
|
@ -23,8 +23,8 @@ add_file () {
|
|||
echo "$name" >"$name" &&
|
||||
git add "$name" &&
|
||||
test_tick &&
|
||||
msg_added_iso88591=$(echo "Add $name ($added $name)" | iconv -f utf-8 -t iso-8859-1) &&
|
||||
git -c 'i18n.commitEncoding=iso-8859-1' commit -m "$msg_added_iso88591"
|
||||
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"
|
||||
done >/dev/null &&
|
||||
git rev-parse --short --verify HEAD
|
||||
)
|
||||
|
|
|
@ -32,8 +32,8 @@ test_expect_success 'set up basic repos' '
|
|||
>bar &&
|
||||
git add foo &&
|
||||
test_tick &&
|
||||
git config i18n.commitEncoding iso-8859-1 &&
|
||||
git commit -m "$(commit_msg iso-8859-1)" &&
|
||||
git config i18n.commitEncoding iso8859-1 &&
|
||||
git commit -m "$(commit_msg iso8859-1)" &&
|
||||
git add bar &&
|
||||
test_tick &&
|
||||
git commit -m "add bar" &&
|
||||
|
@ -61,8 +61,8 @@ test_expect_success 'alias user-defined format' '
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'alias user-defined tformat with %s (iso-8859-1 encoding)' '
|
||||
git config i18n.logOutputEncoding iso-8859-1 &&
|
||||
test_expect_success 'alias user-defined tformat with %s (iso8859-1 encoding)' '
|
||||
git config i18n.logOutputEncoding iso8859-1 &&
|
||||
git log --oneline >expected-s &&
|
||||
git log --pretty="tformat:%h %s" >actual-s &&
|
||||
git config --unset i18n.logOutputEncoding &&
|
||||
|
|
|
@ -12,15 +12,15 @@ test_tick
|
|||
# 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 iso-8859-1)
|
||||
added_iso88591=$(echo "$added" | iconv -f utf-8 -t iso8859-1)
|
||||
# same but "changed"
|
||||
changed=$(printf "changed (ge\303\244ndert) foo")
|
||||
changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t iso-8859-1)
|
||||
changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t iso8859-1)
|
||||
|
||||
test_expect_success 'setup' '
|
||||
: >foo &&
|
||||
git add foo &&
|
||||
git config i18n.commitEncoding iso-8859-1 &&
|
||||
git config i18n.commitEncoding iso8859-1 &&
|
||||
git commit -m "$added_iso88591" &&
|
||||
head1=$(git rev-parse --verify HEAD) &&
|
||||
head1_short=$(git rev-parse --verify --short $head1) &&
|
||||
|
@ -136,9 +136,9 @@ EOF
|
|||
|
||||
test_format encoding %e <<EOF
|
||||
commit $head2
|
||||
iso-8859-1
|
||||
iso8859-1
|
||||
commit $head1
|
||||
iso-8859-1
|
||||
iso8859-1
|
||||
EOF
|
||||
|
||||
test_format subject %s <<EOF
|
||||
|
@ -242,9 +242,9 @@ test_format complex-encoding %e <<EOF
|
|||
commit $head3
|
||||
iso8859-1
|
||||
commit $head2
|
||||
iso-8859-1
|
||||
iso8859-1
|
||||
commit $head1
|
||||
iso-8859-1
|
||||
iso8859-1
|
||||
EOF
|
||||
|
||||
test_format complex-subject %s <<EOF
|
||||
|
|
|
@ -39,7 +39,7 @@ test_expect_success 'creating initial files and commits' '
|
|||
|
||||
echo "1st line 2nd file" >secondfile &&
|
||||
echo "2nd line 2nd file" >>secondfile &&
|
||||
git -c "i18n.commitEncoding=iso-8859-1" commit -a -m "$(commit_msg iso-8859-1)" &&
|
||||
git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
|
||||
head5=$(git rev-parse --verify HEAD)
|
||||
'
|
||||
# git log --pretty=oneline # to see those SHA1 involved
|
||||
|
@ -62,10 +62,10 @@ test_expect_success 'reset --hard message' '
|
|||
test_cmp .expected .actual
|
||||
'
|
||||
|
||||
test_expect_success 'reset --hard message (iso-8859-1 logoutencoding)' '
|
||||
test_expect_success 'reset --hard message (iso8859-1 logoutputencoding)' '
|
||||
hex=$(git log -1 --format="%h") &&
|
||||
git -c "i18n.logOutputEncoding=iso-8859-1" reset --hard > .actual &&
|
||||
echo HEAD is now at $hex $(commit_msg iso-8859-1) > .expected &&
|
||||
git -c "i18n.logOutputEncoding=iso8859-1" reset --hard > .actual &&
|
||||
echo HEAD is now at $hex $(commit_msg iso8859-1) > .expected &&
|
||||
test_cmp .expected .actual
|
||||
'
|
||||
|
||||
|
@ -329,7 +329,7 @@ test_expect_success 'redoing the last two commits should succeed' '
|
|||
|
||||
echo "1st line 2nd file" >secondfile &&
|
||||
echo "2nd line 2nd file" >>secondfile &&
|
||||
git -c "i18n.commitEncoding=iso-8859-1" commit -a -m "$(commit_msg iso-8859-1)" &&
|
||||
git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
|
||||
check_changes $head5
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue