|
diff --git a/ui-diff.c b/ui-diff.c index 625b5fd..12e78b1 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -249,30 +249,24 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
249 | enum object_type type; |
249 | enum object_type type; |
250 | unsigned long size; |
250 | unsigned long size; |
251 | struct commit *commit, *commit2; |
251 | struct commit *commit, *commit2; |
252 | |
252 | |
253 | if (!new_rev) |
253 | if (!new_rev) |
254 | new_rev = ctx.qry.head; |
254 | new_rev = ctx.qry.head; |
255 | get_sha1(new_rev, new_rev_sha1); |
255 | get_sha1(new_rev, new_rev_sha1); |
256 | type = sha1_object_info(new_rev_sha1, &size); |
256 | type = sha1_object_info(new_rev_sha1, &size); |
257 | if (type == OBJ_BAD) { |
257 | if (type == OBJ_BAD) { |
258 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
258 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
259 | return; |
259 | return; |
260 | } |
260 | } |
261 | if (type != OBJ_COMMIT) { |
| |
262 | cgit_print_error(fmt("Unhandled object type: %s", |
| |
263 | typename(type))); |
| |
264 | return; |
| |
265 | } |
| |
266 | |
| |
267 | commit = lookup_commit_reference(new_rev_sha1); |
261 | commit = lookup_commit_reference(new_rev_sha1); |
268 | if (!commit || parse_commit(commit)) |
262 | if (!commit || parse_commit(commit)) |
269 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
263 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
270 | |
264 | |
271 | if (old_rev) |
265 | if (old_rev) |
272 | get_sha1(old_rev, old_rev_sha1); |
266 | get_sha1(old_rev, old_rev_sha1); |
273 | else if (commit->parents && commit->parents->item) |
267 | else if (commit->parents && commit->parents->item) |
274 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
268 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
275 | else |
269 | else |
276 | hashclr(old_rev_sha1); |
270 | hashclr(old_rev_sha1); |
277 | |
271 | |
278 | if (!is_null_sha1(old_rev_sha1)) { |
272 | if (!is_null_sha1(old_rev_sha1)) { |
|