Merge branch 'jc/same-encoding'

diff --git a/notes.c b/notes.c
index bc454e1eab2b0e1d264cee7bb1f84bdb3bb14237..ee8f01f1d5c1dcb39c40eee443eddaedde380d20 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -1231,7 +1231,7 @@ static void format_note(struct notes_tree *t, const unsigned char *object_sha1,
        }
 
        if (output_encoding && *output_encoding &&
-                       strcmp(utf8, output_encoding)) {
+           !is_encoding_utf8(output_encoding)) {
                char *reencoded = reencode_string(msg, output_encoding, utf8);
                if (reencoded) {
                        free(msg);