summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
authorLars Hjemli <hjemli@gmail.com>2008-05-18 19:09:26 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-05-18 19:13:21 (UTC)
commit502d57596e645ec91bb9b8ca62833cdb0de4a3b1 (patch) (side-by-side diff)
treecf825746aee92fc7b50d5b35173a4c38739ecbbf /ui-commit.c
parent17890d0058c1555133c8767ceb123e809e6971ab (diff)
downloadcgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.zip
cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.tar.gz
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') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c10
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
@@ -20,2 +20,3 @@ void cgit_print_commit(char *hex)
char *tmp;
+ int parents = 0;
@@ -77,2 +78,3 @@ void cgit_print_commit(char *hex)
html(")</td></tr>");
+ parents++;
}
@@ -91,5 +93,7 @@ void cgit_print_commit(char *hex)
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);