diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-29 13:48:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-29 13:48:58 -0700 |
| commit | 0988e665e936d0c2c861dcd652bff9817e9446bf (patch) | |
| tree | ff5c6b6ec705cfef6e31fdd656fe5b98464a0235 /pretty.c | |
| parent | 1e93770888d3e71422f9f8defab216f1ebf977c3 (diff) | |
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 'pretty.c')
| -rw-r--r-- | pretty.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pretty.c b/pretty.c index 73b5ead509..9631529c10 100644 --- a/pretty.c +++ b/pretty.c @@ -671,11 +671,7 @@ const char *repo_logmsg_reencode(struct repository *r, * If the re-encoding failed, out might be NULL here; in that * case we just return the commit message verbatim. */ - if (!out) { - warning("unable to reencode commit to '%s'", output_encoding); - return msg; - } - return out; + return out ? out : msg; } static int mailmap_name(const char **email, size_t *email_len, |