mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-commit: handle root commits

Browse Source 
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>
This commit is contained in:
Lars Hjemli 2008-05-18 21:09:26 +02:00
parent 17890d0058
commit 502d57596e
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/t0105-commit.sh
View File

@ -19,4 +19,19 @@ run_test 'find diff summary' '
grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp 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 "</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 tests_done

8
ui-commit.c
View File

@ -18,6 +18,7 @@ void cgit_print_commit(char *hex)
struct commit_list *p; struct commit_list *p;
unsigned char sha1[20]; unsigned char sha1[20];
char *tmp; char *tmp;
int parents = 0;
if (!hex) if (!hex)
hex = ctx.qry.head; hex = ctx.qry.head;
@ -75,6 +76,7 @@ void cgit_print_commit(char *hex)
cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
sha1_to_hex(p->item->object.sha1), NULL); sha1_to_hex(p->item->object.sha1), NULL);
html(")</td></tr>"); html(")</td></tr>");
parents++;
} }
if (ctx.repo->snapshots) { if (ctx.repo->snapshots) {
html("<tr><th>download</th><td colspan='2' class='sha1'>"); 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("<div class='commit-msg'>");
html_txt(info->msg); html_txt(info->msg);
html("</div>"); html("</div>");
if (!(commit->parents && commit->parents->next && if (parents < 3) {
commit->parents->next->next)) { if (parents)
tmp = sha1_to_hex(commit->parents->item->object.sha1); tmp = sha1_to_hex(commit->parents->item->object.sha1);
else
tmp = NULL;
cgit_print_diff(ctx.qry.sha1, tmp, NULL); cgit_print_diff(ctx.qry.sha1, tmp, NULL);
} }
cgit_free_commitinfo(info); cgit_free_commitinfo(info);