diff options
Diffstat (limited to 'ui-diff.c')
-rw-r--r-- | ui-diff.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -385,7 +385,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, | |||
385 | const char *prefix, int show_ctrls, int raw) | 385 | const char *prefix, int show_ctrls, int raw) |
386 | { | 386 | { |
387 | struct commit *commit, *commit2; | 387 | struct commit *commit, *commit2; |
388 | const unsigned char *old_tree_sha1, *new_tree_sha1; | 388 | const struct object_id *old_tree_oid, *new_tree_oid; |
389 | diff_type difftype; | 389 | diff_type difftype; |
390 | 390 | ||
391 | /* | 391 | /* |
@@ -407,13 +407,13 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, | |||
407 | "Bad object name: %s", new_rev); | 407 | "Bad object name: %s", new_rev); |
408 | return; | 408 | return; |
409 | } | 409 | } |
410 | commit = lookup_commit_reference(new_rev_oid->hash); | 410 | commit = lookup_commit_reference(new_rev_oid); |
411 | if (!commit || parse_commit(commit)) { | 411 | if (!commit || parse_commit(commit)) { |
412 | cgit_print_error_page(404, "Not found", | 412 | cgit_print_error_page(404, "Not found", |
413 | "Bad commit: %s", oid_to_hex(new_rev_oid)); | 413 | "Bad commit: %s", oid_to_hex(new_rev_oid)); |
414 | return; | 414 | return; |
415 | } | 415 | } |
416 | new_tree_sha1 = commit->tree->object.oid.hash; | 416 | new_tree_oid = &commit->tree->object.oid; |
417 | 417 | ||
418 | if (old_rev) { | 418 | if (old_rev) { |
419 | if (get_oid(old_rev, old_rev_oid)) { | 419 | if (get_oid(old_rev, old_rev_oid)) { |
@@ -428,15 +428,15 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, | |||
428 | } | 428 | } |
429 | 429 | ||
430 | if (!is_null_oid(old_rev_oid)) { | 430 | if (!is_null_oid(old_rev_oid)) { |
431 | commit2 = lookup_commit_reference(old_rev_oid->hash); | 431 | commit2 = lookup_commit_reference(old_rev_oid); |
432 | if (!commit2 || parse_commit(commit2)) { | 432 | if (!commit2 || parse_commit(commit2)) { |
433 | cgit_print_error_page(404, "Not found", | 433 | cgit_print_error_page(404, "Not found", |
434 | "Bad commit: %s", oid_to_hex(old_rev_oid)); | 434 | "Bad commit: %s", oid_to_hex(old_rev_oid)); |
435 | return; | 435 | return; |
436 | } | 436 | } |
437 | old_tree_sha1 = commit2->tree->object.oid.hash; | 437 | old_tree_oid = &commit2->tree->object.oid; |
438 | } else { | 438 | } else { |
439 | old_tree_sha1 = NULL; | 439 | old_tree_oid = NULL; |
440 | } | 440 | } |
441 | 441 | ||
442 | if (raw) { | 442 | if (raw) { |
@@ -449,11 +449,11 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, | |||
449 | 449 | ||
450 | ctx.page.mimetype = "text/plain"; | 450 | ctx.page.mimetype = "text/plain"; |
451 | cgit_print_http_headers(); | 451 | cgit_print_http_headers(); |
452 | if (old_tree_sha1) { | 452 | if (old_tree_oid) { |
453 | diff_tree_sha1(old_tree_sha1, new_tree_sha1, "", | 453 | diff_tree_oid(old_tree_oid, new_tree_oid, "", |
454 | &diffopt); | 454 | &diffopt); |
455 | } else { | 455 | } else { |
456 | diff_root_tree_sha1(new_tree_sha1, "", &diffopt); | 456 | diff_root_tree_oid(new_tree_oid, "", &diffopt); |
457 | } | 457 | } |
458 | diffcore_std(&diffopt); | 458 | diffcore_std(&diffopt); |
459 | diff_flush(&diffopt); | 459 | diff_flush(&diffopt); |