| -rwxr-xr-x | tests/t0105-commit.sh | 15 | ||||
| -rw-r--r-- | ui-commit.c | 8 |
2 files changed, 21 insertions, 2 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 @@ -20,3 +20,18 @@ run_test 'find diff summary' ' ' +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 "</html>" trash/tmp +' + +run_test 'root commit contains diffstat' ' + grep "<a href=./foo/diff/file-1.>file-1</a>" trash/tmp +' + +run_test 'root commit contains diff' ' + grep ">diff --git a/file-1 b/file-1<" trash/tmp && + grep -e "<div class=.add.>+1</div>" 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 @@ -19,4 +19,5 @@ void cgit_print_commit(char *hex) unsigned char sha1[20]; char *tmp; + int parents = 0; if (!hex) @@ -76,4 +77,5 @@ void cgit_print_commit(char *hex) sha1_to_hex(p->item->object.sha1), NULL); html(")</td></tr>"); + parents++; } if (ctx.repo->snapshots) { @@ -90,7 +92,9 @@ void cgit_print_commit(char *hex) html_txt(info->msg); html("</div>"); - if (!(commit->parents && commit->parents->next && - commit->parents->next->next)) { + 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); } |