diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:38:46 +0000 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:38:46 +0000 |
| commit | 9af580d8f6e31ccd68307a728a710c525e4133ab (patch) | |
| tree | 30b5fb3d0d323423da7ee52ba9a45b36bb557252 /ui-commit.c | |
| parent | 023d933121ca7352a069f3886caf6fbe958ba27d (diff) | |
| parent | 581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0 (diff) | |
| download | cgit-9af580d8f6e31ccd68307a728a710c525e4133ab.tar cgit-9af580d8f6e31ccd68307a728a710c525e4133ab.tar.gz cgit-9af580d8f6e31ccd68307a728a710c525e4133ab.zip | |
Merge branch 'sn/subject-link'
Diffstat (limited to 'ui-commit.c')
| -rw-r--r-- | ui-commit.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ui-commit.c b/ui-commit.c index b5e3c01..41313b9 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -15,10 +15,10 @@ void cgit_print_commit(char *hex) { struct commit *commit, *parent; - struct commitinfo *info; + struct commitinfo *info, *parent_info; struct commit_list *p; unsigned char sha1[20]; - char *tmp; + char *tmp, *tmp2; int parents = 0; if (!hex) @@ -82,8 +82,12 @@ void cgit_print_commit(char *hex) } html("<tr><th>parent</th>" "<td colspan='2' class='sha1'>"); - cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, - ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); + tmp = tmp2 = sha1_to_hex(p->item->object.sha1); + if (ctx.repo->enable_subject_links) { + parent_info = cgit_parse_commit(parent); + tmp2 = parent_info->subject; + } + cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0); html(" ("); cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, sha1_to_hex(p->item->object.sha1), NULL, 0); |