ui-log: replace get_sha1() with get_oid()

[cgit.git] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index fc6c145feff4c151fb6d461750b01f3b3f377e0e..4c051e8caa200fa30973338f0670cd77d685b975 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -25,26 +25,30 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                new_rev = ctx.qry.head;
 
        if (get_sha1(new_rev, new_rev_sha1)) {
-               cgit_print_error("Bad object id: %s", new_rev);
+               cgit_print_error_page(404, "Not found",
+                               "Bad object id: %s", new_rev);
                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
        if (!commit) {
-               cgit_print_error("Bad commit reference: %s", new_rev);
+               cgit_print_error_page(404, "Not found",
+                               "Bad commit reference: %s", new_rev);
                return;
        }
 
        if (old_rev) {
                if (get_sha1(old_rev, old_rev_sha1)) {
-                       cgit_print_error("Bad object id: %s", old_rev);
+                       cgit_print_error_page(404, "Not found",
+                                       "Bad object id: %s", old_rev);
                        return;
                }
                if (!lookup_commit_reference(old_rev_sha1)) {
-                       cgit_print_error("Bad commit reference: %s", old_rev);
+                       cgit_print_error_page(404, "Not found",
+                                       "Bad commit reference: %s", old_rev);
                        return;
                }
        } else if (commit->parents && commit->parents->item) {
-               hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+               hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash);
        } else {
                hashclr(old_rev_sha1);
        }
@@ -73,7 +77,8 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
        rev.diff = 1;
        rev.show_root_diff = 1;
        rev.max_parents = 1;
-       rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+       rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
+                       DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
        setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
                        NULL);
        prepare_revision_walk(&rev);