diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-11-04 12:20:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-04 12:20:13 -0700 |
| commit | 99c7db563fb12b053aaa2b4d7556f979c4883ea1 (patch) | |
| tree | b4ddec961575e1ef4d6feb8cac37ff65f92785c9 /t | |
| parent | Git 2.33.1 (diff) | |
| parent | log: document --encoding behavior on iconv() failure (diff) | |
| download | tgif-99c7db563fb12b053aaa2b4d7556f979c4883ea1.tar.xz | |
Merge branch 'jk/log-warn-on-bogus-encoding' into maint
Squelch over-eager warning message added during this cycle.
* jk/log-warn-on-bogus-encoding:
log: document --encoding behavior on iconv() failure
Revert "logmsg_reencode(): warn when iconv() fails"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4210-log-i18n.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/t/t4210-log-i18n.sh b/t/t4210-log-i18n.sh index 0141f36e33..d2dfcf164e 100755 --- a/t/t4210-log-i18n.sh +++ b/t/t4210-log-i18n.sh @@ -131,11 +131,4 @@ 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 |