diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-29 15:43:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-29 15:43:15 -0700 |
| commit | a31efa77c641ed3a71f6445da93f623351afb76e (patch) | |
| tree | 10d2307330fd1cefd628db7fad158763ebc630c1 /t | |
| parent | 4d1ae1a60529a6883877eb13c2905be7a2eef373 (diff) | |
| parent | 9e8fe7b1c789fee4b7d0b219180cd26de80d730e (diff) | |
| download | git-a31efa77c641ed3a71f6445da93f623351afb76e.tar.xz | |
Merge branch 'jk/log-warn-on-bogus-encoding'
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 |