From: Jeff King Date: Fri, 29 Oct 2021 21:10:03 +0000 (-0400) Subject: log: document --encoding behavior on iconv() failure X-Git-Tag: v2.34.0-rc0~4^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e8fe7b1c789fee4b7d0b219180cd26de80d730e;p=thirdparty%2Fgit.git log: document --encoding behavior on iconv() failure We already note that we may produce invalid output when we skip calling iconv() altogether. But we may also do so if iconv() fails, and we have no good alternative. Let's document this to avoid surprising users. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 54d8bb3db0..dc685be363 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -40,7 +40,9 @@ people using 80-column terminals. defaults to UTF-8. Note that if an object claims to be encoded in `X` and we are outputting in `X`, we will output the object verbatim; this means that invalid sequences in the original - commit may be copied to the output. + commit may be copied to the output. Likewise, if iconv(3) fails + to convert the commit, we will quietly output the original + object verbatim. --expand-tabs=:: --expand-tabs::