git: update to v2.9.1

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 5d18296862c19ac33606cc7a12d01da416215ec8..edee79339b12d658e30041f0c2b7ff0cb1229b9b 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -340,7 +340,7 @@ void cgit_print_diff_ctrls(void)
 
        html("<div class='cgit-panel'>");
        html("<b>diff options</b>");
-       html("<form method='get' action='.'>");
+       html("<form method='get'>");
        cgit_add_hidden_formfields(1, 0, ctx.qry.page);
        html("<table>");
        html("<tr><td colspan='2'/></tr>");
@@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                        "Bad commit: %s", sha1_to_hex(new_rev_sha1));
                return;
        }
-       new_tree_sha1 = commit->tree->object.sha1;
+       new_tree_sha1 = commit->tree->object.oid.hash;
 
        if (old_rev) {
                if (get_sha1(old_rev, old_rev_sha1)) {
@@ -422,7 +422,7 @@ void cgit_print_diff(const char *new_rev, const char *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);
        }
@@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                                "Bad commit: %s", sha1_to_hex(old_rev_sha1));
                        return;
                }
-               old_tree_sha1 = commit2->tree->object.sha1;
+               old_tree_sha1 = commit2->tree->object.oid.hash;
        } else {
                old_tree_sha1 = NULL;
        }