diff options
| author | Christian Hesse | 2020-10-20 23:32:45 +0200 |
|---|---|---|
| committer | Christian Hesse | 2020-10-20 23:57:12 +0200 |
| commit | 779631c6dc23c15bbbf45a7c7ab9fffb619037b7 (patch) | |
| tree | 99ddcae06134e97ef490fb1a4c9f6ab095ca5052 /ui-diff.c | |
| parent | git: update to v2.29.0 (diff) | |
| download | cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.tar.gz cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.zip | |
global: replace references to 'sha1' with 'oid'
For some time now sha1 is considered broken and upstream is working to replace it with sha256. Replace all references to 'sha1' with 'oid', just as upstream does. Signed-off-by: Christian Hesse <mail@eworm.de>
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 329c350..5ed5990 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); |