diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:42:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:42:28 -0800 |
| commit | a689faeb5850174edfbbb0a502ef7eee8cd06d76 (patch) | |
| tree | c1ce351a69efce2b7c0a7a2773ffd934a9888e6f /t | |
| parent | 1bab4bba5457bd55fc1c27ddc4218b4b375c8251 (diff) | |
| parent | 79f7ca063d6b74e9d7f3db90c85dfa4a162128e4 (diff) | |
| download | git-a689faeb5850174edfbbb0a502ef7eee8cd06d76.tar.gz git-a689faeb5850174edfbbb0a502ef7eee8cd06d76.tar.xz | |
Merge branch 'uk/maint-shortlog-encoding'
Conflicts:
builtin-shortlog.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4201-shortlog.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index 405b97119..dd818f6fd 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -52,4 +52,32 @@ 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 +} + +DSCHO="Jöhännës \"Dschö\" Schindëlin" +DSCHOE="$DSCHO <Johannes.Schindelin@gmx.de>" +MSG1="set a1 to 2 and some non-ASCII chars: Äßø" +MSG2="set a1 to 3 and some non-ASCII chars: áæï" +cat > expect << EOF +$DSCHO (2): + $MSG1 + $MSG2 + +EOF + +test_expect_success 'shortlog encoding' ' + git reset --hard "$commit" && + git config --unset i18n.commitencoding && + echo 2 > a1 && + git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 && + git config i18n.commitencoding "ISO-8859-1" && + echo 3 > a1 && + git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \ + --author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 && + git config --unset i18n.commitencoding && + git shortlog HEAD~2.. > out && +test_cmp expect out' + test_done |