Merge branch 'jk/log-warn-on-bogus-encoding'

[thirdparty/git.git] / pretty.c

diff --git a/pretty.c b/pretty.c
index fe95107ae5a4150797be620e254466f8dce6423f..be477bd51f238ef565a41a3bc04059e7655a3b5a 100644 (file)
--- 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,