From e15842af627de03845b9c949f1f1596d94e3be02 Mon Sep 17 00:00:00 2001 From: Stefan Naewe Date: Mon, 15 Feb 2010 09:57:50 +0100 Subject: display subject instead of sha1 as link title of parents Signed-off-by: Stefan Naewe Signed-off-by: Lars Hjemli --- ui-commit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ui-commit.c') diff --git a/ui-commit.c b/ui-commit.c index b5e3c01..4d4970f 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -15,7 +15,7 @@ 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; @@ -82,8 +82,10 @@ void cgit_print_commit(char *hex) } html("parent" ""); - cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, - ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); + parent_info = cgit_parse_commit(parent); + tmp = sha1_to_hex(p->item->object.sha1); + cgit_commit_link(parent_info->subject, 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); -- cgit v1.2.1 From 581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 27 Feb 2010 13:12:55 +0100 Subject: Optionally generate verbose parent links The new option 'enable-subject-links' must be used to enable the verbose parent-links in commit view. Signed-off-by: Lars Hjemli --- ui-commit.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'ui-commit.c') diff --git a/ui-commit.c b/ui-commit.c index 4d4970f..41313b9 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -18,7 +18,7 @@ void cgit_print_commit(char *hex) struct commitinfo *info, *parent_info; struct commit_list *p; unsigned char sha1[20]; - char *tmp; + char *tmp, *tmp2; int parents = 0; if (!hex) @@ -82,10 +82,12 @@ void cgit_print_commit(char *hex) } html("parent" ""); - parent_info = cgit_parse_commit(parent); - tmp = sha1_to_hex(p->item->object.sha1); - cgit_commit_link(parent_info->subject, NULL, NULL, - ctx.qry.head, tmp, 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); -- cgit v1.2.1