Merge branch 'jk/log-warn-on-bogus-encoding' into maint
commitd9e267755904d996b82219c00521c241ca52305a
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:43 +0000 (12 13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:43 +0000 (12 13:51 -0700)
tree80f10de719dbd87c39bc4c2d0bb3ccd047db1fe0
parent48939c572c68b06c9b89834c73743fa89a718652
parent1e93770888d3e71422f9f8defab216f1ebf977c3
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