diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:43 -0700 |
| commit | d9e267755904d996b82219c00521c241ca52305a (patch) | |
| tree | 80f10de719dbd87c39bc4c2d0bb3ccd047db1fe0 /t | |
| parent | Merge branch 'tk/fast-export-anonymized-tag-fix' into maint (diff) | |
| parent | docs: use "character encoding" to refer to commit-object encoding (diff) | |
| download | tgif-d9e267755904d996b82219c00521c241ca52305a.tar.xz | |
Merge branch 'jk/log-warn-on-bogus-encoding' into maint
Doc update plus improved error reporting.
* jk/log-warn-on-bogus-encoding:
docs: use "character encoding" to refer to commit-object encoding
logmsg_reencode(): warn when iconv() fails
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4210-log-i18n.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4210-log-i18n.sh b/t/t4210-log-i18n.sh index d2dfcf164e..0141f36e33 100755 --- a/t/t4210-log-i18n.sh +++ b/t/t4210-log-i18n.sh @@ -131,4 +131,11 @@ do fi done +test_expect_success 'log shows warning when conversion fails' ' + enc=this-encoding-does-not-exist && + git log -1 --encoding=$enc 2>err && + echo "warning: unable to reencode commit to ${SQ}${enc}${SQ}" >expect && + test_cmp expect err +' + test_done |