-rw-r--r-- | ui-commit.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ui-commit.c b/ui-commit.c index 2d98ed9..a11bc5f 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -12,16 +12,16 @@ | |||
12 | #include "ui-diff.h" | 12 | #include "ui-diff.h" |
13 | #include "ui-log.h" | 13 | #include "ui-log.h" |
14 | 14 | ||
15 | void cgit_print_commit(char *hex, const char *prefix) | 15 | void cgit_print_commit(char *hex, const char *prefix) |
16 | { | 16 | { |
17 | struct commit *commit, *parent; | 17 | struct commit *commit, *parent; |
18 | struct commitinfo *info; | 18 | struct commitinfo *info, *parent_info; |
19 | struct commit_list *p; | 19 | struct commit_list *p; |
20 | unsigned char sha1[20]; | 20 | unsigned char sha1[20]; |
21 | char *tmp; | 21 | char *tmp, *tmp2; |
22 | int parents = 0; | 22 | int parents = 0; |
23 | 23 | ||
24 | if (!hex) | 24 | if (!hex) |
25 | hex = ctx.qry.head; | 25 | hex = ctx.qry.head; |
26 | 26 | ||
27 | if (get_sha1(hex, sha1)) { | 27 | if (get_sha1(hex, sha1)) { |
@@ -83,15 +83,18 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
83 | cgit_print_error("Error reading parent commit"); | 83 | cgit_print_error("Error reading parent commit"); |
84 | html("</td></tr>"); | 84 | html("</td></tr>"); |
85 | continue; | 85 | continue; |
86 | } | 86 | } |
87 | html("<tr><th>parent</th>" | 87 | html("<tr><th>parent</th>" |
88 | "<td colspan='2' class='sha1'>"); | 88 | "<td colspan='2' class='sha1'>"); |
89 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 89 | tmp = tmp2 = sha1_to_hex(p->item->object.sha1); |
90 | ctx.qry.head, | 90 | if (ctx.repo->enable_subject_links) { |
91 | sha1_to_hex(p->item->object.sha1), prefix, 0); | 91 | parent_info = cgit_parse_commit(parent); |
92 | tmp2 = parent_info->subject; | ||
93 | } | ||
94 | cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0); | ||
92 | html(" ("); | 95 | html(" ("); |
93 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 96 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
94 | sha1_to_hex(p->item->object.sha1), prefix, 0); | 97 | sha1_to_hex(p->item->object.sha1), prefix, 0); |
95 | html(")</td></tr>"); | 98 | html(")</td></tr>"); |
96 | parents++; | 99 | parents++; |
97 | } | 100 | } |