diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 21:09:26 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 21:13:21 +0200 |
| commit | 502d57596e645ec91bb9b8ca62833cdb0de4a3b1 (patch) | |
| tree | cf825746aee92fc7b50d5b35173a4c38739ecbbf /ui-commit.c | |
| parent | 17890d0058c1555133c8767ceb123e809e6971ab (diff) | |
| download | pkg-cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.zip pkg-cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.tar.gz pkg-cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.tar.bz2 | |
ui-commit: handle root commits
Both cgit_print_diff() and cgit_diff_tree() handles root commits nicely,
but cgit_print_commit() forgot to check the case of 0 parents.
This fixes it, and adds tests to avoid future regressions.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-commit.c')
| -rw-r--r-- | ui-commit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui-commit.c b/ui-commit.c index 1aa5d34..4bbb391 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -18,6 +18,7 @@ void cgit_print_commit(char *hex) struct commit_list *p; unsigned char sha1[20]; char *tmp; + int parents = 0; if (!hex) hex = ctx.qry.head; @@ -75,6 +76,7 @@ void cgit_print_commit(char *hex) cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, sha1_to_hex(p->item->object.sha1), NULL); html(")</td></tr>"); + parents++; } if (ctx.repo->snapshots) { html("<tr><th>download</th><td colspan='2' class='sha1'>"); @@ -89,9 +91,11 @@ void cgit_print_commit(char *hex) html("<div class='commit-msg'>"); html_txt(info->msg); html("</div>"); - if (!(commit->parents && commit->parents->next && - commit->parents->next->next)) { - tmp = sha1_to_hex(commit->parents->item->object.sha1); + if (parents < 3) { + if (parents) + tmp = sha1_to_hex(commit->parents->item->object.sha1); + else + tmp = NULL; cgit_print_diff(ctx.qry.sha1, tmp, NULL); } cgit_free_commitinfo(info); |