diff options
| author | Alexey Shumkin <alex.crezoff@gmail.com> | 2014-05-21 17:20:04 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-21 11:10:06 -0700 |
| commit | ee3efaf66c7599340a5deb030ee6969b6d7d39aa (patch) | |
| tree | 211a29485f15223898de4d4860967777f90a5401 /t/t4205-log-pretty-formats.sh | |
| parent | 496a69802bc4035d5dc26c8d97144d8ae30e52c4 (diff) | |
| download | git-ee3efaf66c7599340a5deb030ee6969b6d7d39aa.tar.gz git-ee3efaf66c7599340a5deb030ee6969b6d7d39aa.tar.xz | |
t4041, t4205, t6006, t7102: don't hardcode tested encoding value
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 iso8859-1.
Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
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 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index f9f33aeab..f5ea3f893 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 && |