From 502d57596e645ec91bb9b8ca62833cdb0de4a3b1 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 18 May 2008 21:09:26 +0200 Subject: 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 --- tests/t0105-commit.sh | 15 +++++++++++++++ ui-commit.c | 10 +++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index aa2bf33..4e1236b 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh @@ -19,4 +19,19 @@ run_test 'find diff summary' ' grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp ' +run_test 'get root commit' ' + root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && + cgit_url "foo/commit&id=$root" >trash/tmp && + grep "" trash/tmp +' + +run_test 'root commit contains diffstat' ' + grep "file-1" trash/tmp +' + +run_test 'root commit contains diff' ' + grep ">diff --git a/file-1 b/file-1<" trash/tmp && + grep -e "
+1
" trash/tmp +' + tests_done 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(")"); + parents++; } if (ctx.repo->snapshots) { html("download"); @@ -89,9 +91,11 @@ void cgit_print_commit(char *hex) html("
"); html_txt(info->msg); html("
"); - 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); -- cgit v1.2.3