Merge branch 'jk/log-warn-on-bogus-encoding'
commita31efa77c641ed3a71f6445da93f623351afb76e
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Oct 2021 22:43:15 +0000 (29 15:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Oct 2021 22:43:15 +0000 (29 15:43 -0700)
tree10d2307330fd1cefd628db7fad158763ebc630c1
parent4d1ae1a60529a6883877eb13c2905be7a2eef373
parent9e8fe7b1c789fee4b7d0b219180cd26de80d730e
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"
pretty.c