diff options
author | Lars Hjemli | 2008-05-18 21:09:26 +0200 |
---|---|---|
committer | Lars Hjemli | 2008-05-18 21:13:21 +0200 |
commit | 502d57596e645ec91bb9b8ca62833cdb0de4a3b1 (patch) | |
tree | cf825746aee92fc7b50d5b35173a4c38739ecbbf | |
parent | 17890d0058c1555133c8767ceb123e809e6971ab (diff) | |
download | cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.tar.gz cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.tar.bz2 cgit-502d57596e645ec91bb9b8ca62833cdb0de4a3b1.zip |
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>
-rwxr-xr-x | tests/t0105-commit.sh | 15 | ||||
-rw-r--r-- | 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' ' | |||
19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp | 19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp |
20 | ' | 20 | ' |
21 | 21 | ||
22 | run_test 'get root commit' ' | ||
23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && | ||
24 | cgit_url "foo/commit&id=$root" >trash/tmp && | ||
25 | grep "</html>" trash/tmp | ||
26 | ' | ||
27 | |||
28 | run_test 'root commit contains diffstat' ' | ||
29 | grep "<a href=./foo/diff/file-1.>file-1</a>" trash/tmp | ||
30 | ' | ||
31 | |||
32 | run_test 'root commit contains diff' ' | ||
33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && | ||
34 | grep -e "<div class=.add.>+1</div>" trash/tmp | ||
35 | ' | ||
36 | |||
22 | tests_done | 37 | 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) | |||
18 | struct commit_list *p; | 18 | struct commit_list *p; |
19 | unsigned char sha1[20]; | 19 | unsigned char sha1[20]; |
20 | char *tmp; | 20 | char *tmp; |
21 | int parents = 0; | ||
21 | 22 | ||
22 | if (!hex) | 23 | if (!hex) |
23 | hex = ctx.qry.head; | 24 | hex = ctx.qry.head; |
@@ -75,6 +76,7 @@ void cgit_print_commit(char *hex) | |||
75 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 76 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
76 | sha1_to_hex(p->item->object.sha1), NULL); | 77 | sha1_to_hex(p->item->object.sha1), NULL); |
77 | html(")</td></tr>"); | 78 | html(")</td></tr>"); |
79 | parents++; | ||
78 | } | 80 | } |
79 | if (ctx.repo->snapshots) { | 81 | if (ctx.repo->snapshots) { |
80 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 82 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
@@ -89,9 +91,11 @@ void cgit_print_commit(char *hex) | |||
89 | html("<div class='commit-msg'>"); | 91 | html("<div class='commit-msg'>"); |
90 | html_txt(info->msg); | 92 | html_txt(info->msg); |
91 | html("</div>"); | 93 | html("</div>"); |
92 | if (!(commit->parents && commit->parents->next && | 94 | if (parents < 3) { |
93 | commit->parents->next->next)) { | 95 | if (parents) |
94 | tmp = sha1_to_hex(commit->parents->item->object.sha1); | 96 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
97 | else | ||
98 | tmp = NULL; | ||
95 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); | 99 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); |
96 | } | 100 | } |
97 | cgit_free_commitinfo(info); | 101 | cgit_free_commitinfo(info); |