summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/pretty.c b/pretty.c
index fe95107..be477bd 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,