-rw-r--r-- | ui-commit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui-commit.c b/ui-commit.c index b3a2063..1793921 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -62,40 +62,44 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
62 | html(" ("); | 62 | html(" ("); |
63 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); | 63 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); |
64 | html(") ("); | 64 | html(") ("); |
65 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | 65 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
66 | cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); | 66 | cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); |
67 | else | 67 | else |
68 | cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); | 68 | cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); |
69 | html(")</td></tr>\n"); | 69 | html(")</td></tr>\n"); |
70 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 70 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
71 | tmp = xstrdup(hex); | 71 | tmp = xstrdup(hex); |
72 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 72 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
73 | ctx.qry.head, tmp, NULL); | 73 | ctx.qry.head, tmp, NULL); |
74 | if (prefix) { | ||
75 | html(" /"); | ||
76 | cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix); | ||
77 | } | ||
74 | html("</td></tr>\n"); | 78 | html("</td></tr>\n"); |
75 | for (p = commit->parents; p ; p = p->next) { | 79 | for (p = commit->parents; p ; p = p->next) { |
76 | parent = lookup_commit_reference(p->item->object.sha1); | 80 | parent = lookup_commit_reference(p->item->object.sha1); |
77 | if (!parent) { | 81 | if (!parent) { |
78 | html("<tr><td colspan='3'>"); | 82 | html("<tr><td colspan='3'>"); |
79 | cgit_print_error("Error reading parent commit"); | 83 | cgit_print_error("Error reading parent commit"); |
80 | html("</td></tr>"); | 84 | html("</td></tr>"); |
81 | continue; | 85 | continue; |
82 | } | 86 | } |
83 | html("<tr><th>parent</th>" | 87 | html("<tr><th>parent</th>" |
84 | "<td colspan='2' class='sha1'>"); | 88 | "<td colspan='2' class='sha1'>"); |
85 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 89 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
86 | ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); | 90 | ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); |
87 | html(" ("); | 91 | html(" ("); |
88 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 92 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
89 | sha1_to_hex(p->item->object.sha1), NULL, 0); | 93 | sha1_to_hex(p->item->object.sha1), prefix, 0); |
90 | html(")</td></tr>"); | 94 | html(")</td></tr>"); |
91 | parents++; | 95 | parents++; |
92 | } | 96 | } |
93 | if (ctx.repo->snapshots) { | 97 | if (ctx.repo->snapshots) { |
94 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 98 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
95 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, | 99 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
96 | hex, ctx.repo->snapshots); | 100 | hex, ctx.repo->snapshots); |
97 | html("</td></tr>"); | 101 | html("</td></tr>"); |
98 | } | 102 | } |
99 | html("</table>\n"); | 103 | html("</table>\n"); |
100 | html("<div class='commit-subject'>"); | 104 | html("<div class='commit-subject'>"); |
101 | if (ctx.repo->commit_filter) | 105 | if (ctx.repo->commit_filter) |