1 files changed, 14 insertions, 0 deletions

diff --git a/parsing.c b/parsing.c
index f156c12..c731084 100644
--- a/parsing.c
+++ b/parsing.c
@@ -307,32 +307,46 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                 p = strchr(p, '\n') + 1;
 
         t = strchr(p, '\n');
         if (t) {
                 if (*t == '\0')
                         ret->subject = "** empty **";
                 else
                         ret->subject = substr(p, t);
                 p = t + 1;
 
                 while (*p == '\n')
                         p = strchr(p, '\n') + 1;
                 ret->msg = xstrdup(p);
         } else
                 ret->subject = substr(p, p+strlen(p));
 
+        if(strcmp(ret->msg_encoding, PAGE_ENCODING)) {
+                t = iconv_msg(ret->subject, ret->msg_encoding);
+                if(t) {
+                        free(ret->subject);
+                        ret->subject = t;
+                }
+
+                t = iconv_msg(ret->msg, ret->msg_encoding);
+                if(t) {
+                        free(ret->msg);
+                        ret->msg = t;
+                }
+        }
+
         return ret;
 }
 
 
 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
         void *data;
         enum object_type type;
         unsigned long size;
         char *p, *t;
         struct taginfo *ret;
 
         data = read_sha1_file(tag->object.sha1, &type, &size);
         if (!data || type != OBJ_TAG) {
                 free(data);
                 return 0;