On Fri, Oct 29, 2021 at 01:52:02PM -0700, Junio C Hamano wrote: > > I tend to agree with the above. Let's not over-engineer things. > > ----- >8 --------- >8 --------- >8 --------- >8 --------- >8 ----- > From: Junio C Hamano <gitster@xxxxxxxxx> > Date: Fri, 29 Oct 2021 13:48:58 -0700 > Subject: [PATCH] Revert "logmsg_reencode(): warn when iconv() fails" > > This reverts commit fd680bc5 (logmsg_reencode(): warn when iconv() > fails, 2021-08-27). Throwing a warning for each and every commit > that gets reencoded, without allowing a way to squelch, would make > it unpleasant for folks who have to deal with an ancient part of the > history in an old project that used wrong encoding in the commits. Thanks for tying this up. I do think fd680bc5's documentation was good, though. So I'd suggest squashing this in, or applying it on top. -- >8 -- Subject: [PATCH] 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 <peff@xxxxxxxx> --- Documentation/pretty-options.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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=<n>:: --expand-tabs:: -- 2.33.1.1446.g3ed047b518
