diff options
author | Lars Hjemli | 2011-07-22 12:22:17 +0000 |
---|---|---|
committer | Lars Hjemli | 2011-07-22 12:22:17 +0000 |
commit | 756e3ea6392e30bcd0a41346d4ffa42c56d715e2 (patch) | |
tree | 5b5da8cd867dfe801ecfc4c6c2c2b01a00cc4ea8 /ui-diff.c | |
parent | bf8c7a4c93bdc95d841b25a60644cca3ec124625 (diff) | |
parent | bebe89d7c11a92bf206bf6e528c51ffa8ecbc0d5 (diff) | |
download | cgit-756e3ea6392e30bcd0a41346d4ffa42c56d715e2.tar.gz cgit-756e3ea6392e30bcd0a41346d4ffa42c56d715e2.tar.bz2 cgit-756e3ea6392e30bcd0a41346d4ffa42c56d715e2.zip |
Merge branch 'stable'
Diffstat (limited to 'ui-diff.c')
-rw-r--r-- | ui-diff.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -97,10 +97,12 @@ static void print_fileinfo(struct fileinfo *info) | |||
97 | htmlf("</td><td class='%s'>", class); | 97 | htmlf("</td><td class='%s'>", class); |
98 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 98 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
99 | ctx.qry.sha2, info->new_path, 0); | 99 | ctx.qry.sha2, info->new_path, 0); |
100 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 100 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { |
101 | htmlf(" (%s from %s)", | 101 | htmlf(" (%s from ", |
102 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | 102 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); |
103 | info->old_path); | 103 | html_txt(info->old_path); |
104 | html(")"); | ||
105 | } | ||
104 | html("</td><td class='right'>"); | 106 | html("</td><td class='right'>"); |
105 | if (info->binary) { | 107 | if (info->binary) { |
106 | htmlf("bin</td><td class='graph'>%ld -> %ld bytes", | 108 | htmlf("bin</td><td class='graph'>%ld -> %ld bytes", |