Skip to content

Commit 9e8fe7b

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0988e66 commit 9e8fe7b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Documentation/pretty-options.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ people using 80-column terminals.
4040
defaults to UTF-8. Note that if an object claims to be encoded
4141
in `X` and we are outputting in `X`, we will output the object
4242
verbatim; this means that invalid sequences in the original
43-
commit may be copied to the output.
43+
commit may be copied to the output. Likewise, if iconv(3) fails
44+
to convert the commit, we will quietly output the original
45+
object verbatim.
4446

4547
--expand-tabs=<n>::
4648
--expand-tabs::

0 commit comments

Comments
 (0)