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 /ui-commit.c | |
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>
-rw-r--r-- | ui-commit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui-commit.c b/ui-commit.c index 1aa5d34..4bbb391 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -15,12 +15,13 @@ void cgit_print_commit(char *hex) | |||
15 | { | 15 | { |
16 | struct commit *commit, *parent; | 16 | struct commit *commit, *parent; |
17 | struct commitinfo *info; | 17 | struct commitinfo *info; |
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; |
24 | 25 | ||
25 | if (get_sha1(hex, sha1)) { | 26 | if (get_sha1(hex, sha1)) { |
26 | cgit_print_error(fmt("Bad object id: %s", hex)); | 27 | cgit_print_error(fmt("Bad object id: %s", hex)); |
@@ -72,12 +73,13 @@ void cgit_print_commit(char *hex) | |||
72 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 73 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
73 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); | 74 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); |
74 | html(" ("); | 75 | html(" ("); |
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'>"); |
81 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, | 83 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
82 | hex, ctx.repo->snapshots); | 84 | hex, ctx.repo->snapshots); |
83 | html("</td></tr>"); | 85 | html("</td></tr>"); |
@@ -86,13 +88,15 @@ void cgit_print_commit(char *hex) | |||
86 | html("<div class='commit-subject'>"); | 88 | html("<div class='commit-subject'>"); |
87 | html_txt(info->subject); | 89 | html_txt(info->subject); |
88 | html("</div>"); | 90 | html("</div>"); |
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); |
98 | } | 102 | } |