summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-10-29 20:48:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-10-29 20:48:58 (GMT)
commit0988e665e936d0c2c861dcd652bff9817e9446bf (patch)
treeff5c6b6ec705cfef6e31fdd656fe5b98464a0235 /Documentation
parent1e93770888d3e71422f9f8defab216f1ebf977c3 (diff)
downloadgit-0988e665e936d0c2c861dcd652bff9817e9446bf.zip
git-0988e665e936d0c2c861dcd652bff9817e9446bf.tar.gz
git-0988e665e936d0c2c861dcd652bff9817e9446bf.tar.bz2
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.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-options.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index b3af850..54d8bb3 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -40,9 +40,7 @@ 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. Likewise, if iconv(3) fails
- to convert the commit, we will output the original object
- verbatim, along with a warning.
+ commit may be copied to the output.
--expand-tabs=<n>::
--expand-tabs::