mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2011-07-22 12:22:17 +00:00
commit 756e3ea639
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parsing.c
View File

@ -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 *cgit_parse_commit(struct commit *commit)
{ {
struct commitinfo *ret; struct commitinfo *ret;
char *p = commit->buffer, *t = commit->buffer; char *p = commit->buffer, *t;
ret = xmalloc(sizeof(*ret)); ret = xmalloc(sizeof(*ret));
ret->commit = commit; ret->commit = commit;

10
ui-diff.c
View File

@ -97,10 +97,12 @@ static void print_fileinfo(struct fileinfo *info)
htmlf("</td><td class='%s'>", class); htmlf("</td><td class='%s'>", class);
cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
ctx.qry.sha2, info->new_path, 0); ctx.qry.sha2, info->new_path, 0);
if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
htmlf(" (%s from %s)", htmlf(" (%s from ",
info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
info->old_path); html_txt(info->old_path);
html(")");
}
html("</td><td class='right'>"); html("</td><td class='right'>");
if (info->binary) { if (info->binary) {
htmlf("bin</td><td class='graph'>%ld -> %ld bytes", htmlf("bin</td><td class='graph'>%ld -> %ld bytes",