From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 4 Nov 2021 19:20:13 +0000 (-0700)
Subject: Merge branch 'jk/log-warn-on-bogus-encoding' into maint
X-Git-Tag: v2.33.2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99c7db563fb12b053aaa2b4d7556f979c4883ea1;p=thirdparty%2Fgit.git

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"
---

99c7db563fb12b053aaa2b4d7556f979c4883ea1