author | Lars Hjemli <hjemli@gmail.com> | 2007-06-06 21:02:40 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-06 21:02:48 (UTC) |
commit | c83db796a1cf6893de275e78b98cef10eccc1200 (patch) (unidiff) | |
tree | a4c474216e635f09a39d08f349802a3ef38fb3eb | |
parent | 4a6201e318d1db69d126f08a3d80ce2d5cf7ac01 (diff) | |
download | cgit-c83db796a1cf6893de275e78b98cef10eccc1200.zip cgit-c83db796a1cf6893de275e78b98cef10eccc1200.tar.gz cgit-c83db796a1cf6893de275e78b98cef10eccc1200.tar.bz2 |
ui-diff: close td/tr/table properly
The previous commit fixed the diff-view when two trees where specified on
the querystring (sha1/sha2) but made the generated html invalid when only
a commit sha1 is specified. This fixes it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -93,32 +93,34 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
93 | { | 93 | { |
94 | unsigned char sha1[20], sha2[20]; | 94 | unsigned char sha1[20], sha2[20]; |
95 | enum object_type type; | 95 | enum object_type type; |
96 | unsigned long size; | 96 | unsigned long size; |
97 | struct commit *commit; | 97 | struct commit *commit; |
98 | 98 | ||
99 | html("<table class='diff'>"); | 99 | html("<table class='diff'>"); |
100 | html("<tr><td>"); | 100 | html("<tr><td>"); |
101 | 101 | ||
102 | if (head && !old_hex && !new_hex) { | 102 | if (head && !old_hex && !new_hex) { |
103 | get_sha1(head, sha1); | 103 | get_sha1(head, sha1); |
104 | commit = lookup_commit_reference(sha1); | 104 | commit = lookup_commit_reference(sha1); |
105 | if (commit && !parse_commit(commit)) | 105 | if (commit && !parse_commit(commit)) |
106 | cgit_diff_commit(commit, filepair_cb); | 106 | cgit_diff_commit(commit, filepair_cb); |
107 | else | 107 | else |
108 | cgit_print_error(fmt("Bad commit: %s", head)); | 108 | cgit_print_error(fmt("Bad commit: %s", head)); |
109 | html("</td></tr>"); | ||
110 | html("</table>"); | ||
109 | return; | 111 | return; |
110 | } | 112 | } |
111 | 113 | ||
112 | get_sha1(old_hex, sha1); | 114 | get_sha1(old_hex, sha1); |
113 | get_sha1(new_hex, sha2); | 115 | get_sha1(new_hex, sha2); |
114 | 116 | ||
115 | type = sha1_object_info(sha1, &size); | 117 | type = sha1_object_info(sha1, &size); |
116 | if (type == OBJ_BAD) { | 118 | if (type == OBJ_BAD) { |
117 | type = sha1_object_info(sha2, &size); | 119 | type = sha1_object_info(sha2, &size); |
118 | if (type == OBJ_BAD) { | 120 | if (type == OBJ_BAD) { |
119 | cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); | 121 | cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); |
120 | return; | 122 | return; |
121 | } | 123 | } |
122 | } | 124 | } |
123 | 125 | ||
124 | switch(type) { | 126 | switch(type) { |