1 files changed, 7 insertions, 9 deletions

diff --git a/ui-diff.c b/ui-diff.c
index e6b957c..3c4d52a 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -87,56 +87,54 @@ static void filepair_cb(struct diff_filepair *pair)
         }
         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)) {
-                        html("<table class='diff'>");
-                        html("<tr><td>");
+                if (commit && !parse_commit(commit))
                         cgit_diff_commit(commit, filepair_cb);
-                        html("</td></tr>");
-                        html("</table>");
-                }
+                else
+                        cgit_print_error(fmt("Bad commit: %s", head));
                 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;
                 }
         }
 
-        html("<table class='diff'>");
         switch(type) {
         case OBJ_BLOB:
-                html("<tr><td>");
                 header(sha1, path, 0644, sha2, path, 0644);
                 if (cgit_diff_files(sha1, sha2, print_line))
                         cgit_print_error("Error running diff");
-                html("</td></tr>");
                 break;
         case OBJ_TREE:
                 cgit_diff_tree(sha1, sha2, filepair_cb);
                 break;
         default:
                 cgit_print_error(fmt("Unhandled object type: %s",
                                      typename(type)));
                 break;
         }
+        html("</td></tr>");
         html("</table>");
 }