diff options
| author | Alexey Shumkin <alex.crezoff@gmail.com> | 2013-07-04 14:45:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-05 09:05:00 +0200 |
| commit | 14332bccc1d88e89fa8950b92c034432e1585bd4 (patch) | |
| tree | a9586b93ef3556a06cffca974c0985befcaeb788 /t/t6006-rev-list-format.sh | |
| parent | t4205: replace .\+ with ..* in sed commands (diff) | |
| download | git-14332bccc1d88e89fa8950b92c034432e1585bd4.tar.xz git-14332bccc1d88e89fa8950b92c034432e1585bd4.zip | |
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>
Diffstat (limited to 't/t6006-rev-list-format.sh')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index 380c85bf12..4751d22217 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -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 |