author | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 19:09:26 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 19:13:21 (UTC) |
commit | 502d57596e645ec91bb9b8ca62833cdb0de4a3b1 (patch) (unidiff) | |
tree | cf825746aee92fc7b50d5b35173a4c38739ecbbf | |
parent | 17890d0058c1555133c8767ceb123e809e6971ab (diff) | |
download | cgit-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>
-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 | |||
@@ -21,2 +21,17 @@ run_test 'find diff summary' ' | |||
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 | |||
@@ -20,2 +20,3 @@ void cgit_print_commit(char *hex) | |||
20 | char *tmp; | 20 | char *tmp; |
21 | int parents = 0; | ||
21 | 22 | ||
@@ -77,2 +78,3 @@ void cgit_print_commit(char *hex) | |||
77 | html(")</td></tr>"); | 78 | html(")</td></tr>"); |
79 | parents++; | ||
78 | } | 80 | } |
@@ -91,5 +93,7 @@ void cgit_print_commit(char *hex) | |||
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); |