Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'
parsing.c | 2 +- ui-diff.c | 10 ++++++----
diff --git a/parsing.c b/parsing.c index 151c0fe468c64174ae260ba9b5ddd2d8de52e81e..602e3de799469ebe8900ee3928638fcac7e850df 100644 --- a/parsing.c +++ b/parsing.c @@ -125,7 +125,7 @@ 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 868ceec23b813f8dbd39b9eda8249131caa308e3..d97a8012cfffc4d10986c27d3f3a6f7bfa4019fd 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -97,10 +97,12 @@ } 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",