diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 14:07:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 14:07:46 -0800 |
| commit | 1a56be134f9477296a7ade040e8b802bf3a643a1 (patch) | |
| tree | d6a7d5fb7dec7d318cdf9cef2f06040fd7fdcc16 /t | |
| parent | eff726f0c28097e7964eb876d005e50e0dcdb9a0 (diff) | |
| parent | adf9628ea41bd226dc5ab38daa0bc661097a2127 (diff) | |
| download | git-1a56be134f9477296a7ade040e8b802bf3a643a1.tar.gz git-1a56be134f9477296a7ade040e8b802bf3a643a1.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.6.5.5
Documentation: xmlto 0.0.18 does not know --stringparam
t4201: use ISO8859-1 rather than ISO-8859-1
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4201-shortlog.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index dd818f6fd..a01e55bf6 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -53,7 +53,7 @@ GIT_DIR=non-existing git shortlog -w < log > out test_expect_success 'shortlog from non-git directory' 'test_cmp expect out' iconvfromutf8toiso88591() { - printf "%s" "$*" | iconv -f UTF-8 -t ISO-8859-1 + printf "%s" "$*" | iconv -f UTF-8 -t ISO8859-1 } DSCHO="Jöhännës \"Dschö\" Schindëlin" @@ -72,7 +72,7 @@ test_expect_success 'shortlog encoding' ' git config --unset i18n.commitencoding && echo 2 > a1 && git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 && - git config i18n.commitencoding "ISO-8859-1" && + git config i18n.commitencoding "ISO8859-1" && echo 3 > a1 && git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \ --author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 && |