From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Oct 2021 22:43:15 +0000 (-0700)
Subject: Merge branch 'jk/log-warn-on-bogus-encoding'
X-Git-Tag: v2.34.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a31efa77c641ed3a71f6445da93f623351afb76e;p=thirdparty%2Fgit.git

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

a31efa77c641ed3a71f6445da93f623351afb76e