summaryrefslogtreecommitdiffabout
authorStefan Naewe <stefan.naewe@atlas-elektronik.com>2010-02-15 08:57:50 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-02-27 11:55:16 (UTC)
commite15842af627de03845b9c949f1f1596d94e3be02 (patch) (side-by-side diff)
treec4bbee5f3325b056c366f77a9f6accd63ffe4a84
parent71d3ca75d1e941948dd3b965f5a5c2f2865e94fd (diff)
downloadcgit-e15842af627de03845b9c949f1f1596d94e3be02.zip
cgit-e15842af627de03845b9c949f1f1596d94e3be02.tar.gz
cgit-e15842af627de03845b9c949f1f1596d94e3be02.tar.bz2
display subject instead of sha1 as link title of parents
Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-commit.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ui-commit.c b/ui-commit.c
index b5e3c01..4d4970f 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -6,25 +6,25 @@
* (see COPYING for full license text)
*/
#include "cgit.h"
#include "html.h"
#include "ui-shared.h"
#include "ui-diff.h"
#include "ui-log.h"
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;
int parents = 0;
if (!hex)
hex = ctx.qry.head;
if (get_sha1(hex, sha1)) {
cgit_print_error(fmt("Bad object id: %s", hex));
return;
}
@@ -73,26 +73,28 @@ void cgit_print_commit(char *hex)
ctx.qry.head, tmp, NULL);
html("</td></tr>\n");
for (p = commit->parents; p ; p = p->next) {
parent = lookup_commit_reference(p->item->object.sha1);
if (!parent) {
html("<tr><td colspan='3'>");
cgit_print_error("Error reading parent commit");
html("</td></tr>");
continue;
}
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);
+ 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);
html(")</td></tr>");
parents++;
}
if (ctx.repo->snapshots) {
html("<tr><th>download</th><td colspan='2' class='sha1'>");
cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
hex, ctx.repo->snapshots);
html("</td></tr>");
}