diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-30 00:43:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-30 00:43:15 +0200 |
| commit | a31efa77c641ed3a71f6445da93f623351afb76e (patch) | |
| tree | 10d2307330fd1cefd628db7fad158763ebc630c1 /pretty.c | |
| parent | Merge branch 'ab/unbundle-progress' (diff) | |
| parent | log: document --encoding behavior on iconv() failure (diff) | |
| download | git-a31efa77c641ed3a71f6445da93f623351afb76e.tar.xz git-a31efa77c641ed3a71f6445da93f623351afb76e.zip | |
Merge branch 'jk/log-warn-on-bogus-encoding'
Squelch over-eager warning message added during this cycle.
* jk/log-warn-on-bogus-encoding:
log: document --encoding behavior on iconv() failure
Revert "logmsg_reencode(): warn when iconv() fails"
Diffstat (limited to 'pretty.c')
| -rw-r--r-- | pretty.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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, |