all repos — cgit @ 756e3ea6392e30bcd0a41346d4ffa42c56d715e2

a hyperfast web frontend for git written in c

Merge branch 'stable'
Lars Hjemli hjemli@gmail.com
Fri, 22 Jul 2011 12:22:17 +0000
commit

756e3ea6392e30bcd0a41346d4ffa42c56d715e2

parent

bf8c7a4c93bdc95d841b25a60644cca3ec124625

2 files changed, 7 insertions(+), 5 deletions(-)

jump to
M parsing.cparsing.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;
M ui-diff.cui-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",