diff options
| author | June McEnroe | 2022-02-13 12:07:49 -0500 |
|---|---|---|
| committer | June McEnroe | 2022-02-13 12:10:49 -0500 |
| commit | 516175469a8c6895496ef909b487992deb45f460 (patch) | |
| tree | e0e8b4d38f05e870089de8babc0d3aca3bb4d3b0 /ui-diff.c | |
| parent | Fix crash trying to print "this commit" on 404s (diff) | |
| parent | git: update to v2.32.0 (diff) | |
| download | cgit-516175469a8c6895496ef909b487992deb45f460.tar.gz cgit-516175469a8c6895496ef909b487992deb45f460.zip | |
Merge up to git v2.32.0
Diffstat (limited to 'ui-diff.c')
| -rw-r--r-- | ui-diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
| diff --git a/ui-diff.c b/ui-diff.c index 97c1ca0..2a64ae8 100644 --- a/ui-diff.c +++ b/ui-diff.c | |||
| @@ -97,8 +97,8 @@ static void print_fileinfo(struct fileinfo *info) | |||
| 97 | html("]</span>"); | 97 | html("]</span>"); |
| 98 | } | 98 | } |
| 99 | htmlf("</td><td class='%s'>", class); | 99 | htmlf("</td><td class='%s'>", class); |
| 100 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 100 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.oid, |
| 101 | ctx.qry.sha2, info->new_path); | 101 | ctx.qry.oid2, info->new_path); |
| 102 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { | 102 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { |
| 103 | htmlf(" (%s from ", | 103 | htmlf(" (%s from ", |
| 104 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); | 104 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); |
| @@ -194,8 +194,8 @@ static void cgit_print_diffstat(const struct object_id *old_oid, | |||
| 194 | int i; | 194 | int i; |
| 195 | 195 | ||
| 196 | html("<div class='diffstat-header'>"); | 196 | html("<div class='diffstat-header'>"); |
| 197 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 197 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.oid, |
| 198 | ctx.qry.sha2, NULL); | 198 | ctx.qry.oid2, NULL); |
| 199 | if (prefix) { | 199 | if (prefix) { |
| 200 | html(" (limited to '"); | 200 | html(" (limited to '"); |
| 201 | html_txt(prefix); | 201 | html_txt(prefix); |