summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 0be845f..11a2ff8 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -110,31 +110,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev)
110 return; 110 return;
111 } 111 }
112 112
113 commit = lookup_commit_reference(sha1); 113 commit = lookup_commit_reference(sha1);
114 if (!commit || parse_commit(commit)) 114 if (!commit || parse_commit(commit))
115 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); 115 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1)));
116 116
117 if (old_rev) 117 if (old_rev)
118 get_sha1(old_rev, sha2); 118 get_sha1(old_rev, sha2);
119 else if (commit->parents && commit->parents->item) 119 else if (commit->parents && commit->parents->item)
120 hashcpy(sha2, commit->parents->item->object.sha1); 120 hashcpy(sha2, commit->parents->item->object.sha1);
121 else 121 else
122 hashclr(sha2); 122 hashclr(sha2);
123 123
124 if (!is_null_sha1(sha2)) { 124 if (!is_null_sha1(sha2)) {
125 type = sha1_object_info(sha2, &size); 125 type = sha1_object_info(sha2, &size);
126 if (type == OBJ_BAD) { 126 if (type == OBJ_BAD) {
127 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); 127 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2)));
128 return; 128 return;
129 } 129 }
130 commit2 = lookup_commit_reference(sha2); 130 commit2 = lookup_commit_reference(sha2);
131 if (!commit2 || parse_commit(commit2)) 131 if (!commit2 || parse_commit(commit2))
132 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); 132 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2)));
133 } 133 }
134
135 html("<table class='diff'>"); 134 html("<table class='diff'>");
136 html("<tr><td>"); 135 html("<tr><td>");
137 cgit_diff_tree(sha2, sha1, filepair_cb); 136 cgit_diff_tree(sha2, sha1, filepair_cb, NULL);
138 html("</td></tr>"); 137 html("</td></tr>");
139 html("</table>"); 138 html("</table>");
140} 139}