Merge branch 'stable'

2 files changed, 7 insertions, 5 deletions

diff --git a/parsing.c b/parsing.c
index 151c0fe..602e3de 100644
--- a/parsing.c
+++ b/parsing.c
@@ -125,7 +125,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
         struct commitinfo *ret;
-        char *p = commit->buffer, *t = commit->buffer;
+        char *p = commit->buffer, *t;
 
         ret = xmalloc(sizeof(*ret));
         ret->commit = commit;
diff --git a/ui-diff.c b/ui-diff.c
index 868ceec..d97a801 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -97,10 +97,12 @@ static void print_fileinfo(struct fileinfo *info)
         htmlf("</td><td class='%s'>", class);
         cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                        ctx.qry.sha2, info->new_path, 0);
-        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
-                htmlf(" (%s from %s)",
-                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
-                      info->old_path);
+        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
+                htmlf(" (%s from ",
+                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
+                html_txt(info->old_path);
+                html(")");
+        }
         html("</td><td class='right'>");
         if (info->binary) {
                 htmlf("bin</td><td class='graph'>%ld -> %ld bytes",