diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
| commit | 5d4756e75ce12a6b67af3a16193f10047ba05218 (patch) | |
| tree | d631c73d8c7a9d2856e4be6ac25faf1cbed588cd /ui-diff.c | |
| parent | 723dc8fbcb1a4609c264758eae420ee2811a2b55 (diff) | |
Squashed 'third_party/cgit/' changes from 8fc0c81bbb..adcc4f822f
adcc4f822f tests: try with commit-graph a1039ab175 tests: do not copy snapshots to /tmp/ a4de0e810b global: replace hard coded hash length 779631c6dc global: replace references to 'sha1' with 'oid' 629659d2cf git: update to v2.29.0 205837d468 git: update to v2.28.0 f780396c0a git: update to v2.27.0 0462f08d85 git: update to v2.26.0 55fa25adb0 Bump version 6a8d6d4b50 global: use proper accessors for maybe_tree 892ba8c3cc ui-snapshot: add support for zstd compression cc230bf044 tests: add tests for xz compressed snapshots 06671f4b21 ui-snapshot: add support for lzip compression fde897b817 git: update to v2.25.1 5e49023b01 tests: allow to skip git version tests fa146ccabd Bump version bd68c98879 git: update to v2.25.0 ca98c9e7bf tests: skip tests if strace is not functional d8e5dd25a0 git: update to v2.24.1 583aa5d80e ui-repolist: do not return unsigned (negative) value bfabd4519c git: update to v2.24.0 git-subtree-dir: third_party/cgit git-subtree-split: adcc4f822fe11836e5f942fc1ae0f00db4eb8d5f
Diffstat (limited to 'ui-diff.c')
| -rw-r--r-- | ui-diff.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui-diff.c b/ui-diff.c index c60aefd1d6..5ed5990c29 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -97,8 +97,8 @@ static void print_fileinfo(struct fileinfo *info) html("]</span>"); } 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); + cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.oid, + ctx.qry.oid2, info->new_path); if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { htmlf(" (%s from ", info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); @@ -194,8 +194,8 @@ static void cgit_print_diffstat(const struct object_id *old_oid, int i; html("<div class='diffstat-header'>"); - cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, - ctx.qry.sha2, NULL); + cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.oid, + ctx.qry.oid2, NULL); if (prefix) { html(" (limited to '"); html_txt(prefix); @@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, "Bad commit: %s", oid_to_hex(new_rev_oid)); return; } - new_tree_oid = &commit->maybe_tree->object.oid; + new_tree_oid = get_commit_tree_oid(commit); if (old_rev) { if (get_oid(old_rev, old_rev_oid)) { @@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, "Bad commit: %s", oid_to_hex(old_rev_oid)); return; } - old_tree_oid = &commit2->maybe_tree->object.oid; + old_tree_oid = get_commit_tree_oid(commit2); } else { old_tree_oid = NULL; } |