diff options
| author | Alexey Shumkin <alex.crezoff@gmail.com> | 2013-07-04 16:45:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-05 00:05:00 -0700 |
| commit | 14332bccc1d88e89fa8950b92c034432e1585bd4 (patch) | |
| tree | a9586b93ef3556a06cffca974c0985befcaeb788 /t/t4205-log-pretty-formats.sh | |
| parent | 7c37521487332fd700e2fa58bd2547d275e4f4d2 (diff) | |
| download | git-14332bccc1d88e89fa8950b92c034432e1585bd4.tar.gz | |
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/t4205-log-pretty-formats.sh')
| -rwxr-xr-x | t/t4205-log-pretty-formats.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 3cfb744017..c2838427d3 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -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 && |