| -rw-r--r-- | ui-diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -85,48 +85,50 @@ static void filepair_cb(struct diff_filepair *pair) print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); return; } if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) cgit_print_error("Error running diff"); } void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) { unsigned char sha1[20], sha2[20]; enum object_type type; unsigned long size; struct commit *commit; html("<table class='diff'>"); html("<tr><td>"); if (head && !old_hex && !new_hex) { get_sha1(head, sha1); commit = lookup_commit_reference(sha1); if (commit && !parse_commit(commit)) cgit_diff_commit(commit, filepair_cb); else cgit_print_error(fmt("Bad commit: %s", head)); + html("</td></tr>"); + html("</table>"); return; } get_sha1(old_hex, sha1); get_sha1(new_hex, sha2); type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { type = sha1_object_info(sha2, &size); if (type == OBJ_BAD) { cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); return; } } switch(type) { case OBJ_BLOB: header(sha1, path, 0644, sha2, path, 0644); if (cgit_diff_files(sha1, sha2, print_line)) cgit_print_error("Error running diff"); break; case OBJ_TREE: cgit_diff_tree(sha1, sha2, filepair_cb); break; |