git: update to v2.18.0

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index a10ce8a96841d0e677918f5f3e0415b38f3144d8..e33e9fb5e1fa46bacaf409fce67d46e13dffd385 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -258,8 +258,8 @@ static void header(const struct object_id *oid1, char *path1, int mode1,
                htmlf("<br/>deleted file mode %.6o", mode1);
 
        if (!subproject) {
                htmlf("<br/>deleted file mode %.6o", mode1);
 
        if (!subproject) {

-               abbrev1 = xstrdup(find_unique_abbrev(oid1->hash, DEFAULT_ABBREV));
-               abbrev2 = xstrdup(find_unique_abbrev(oid2->hash, DEFAULT_ABBREV));
+               abbrev1 = xstrdup(find_unique_abbrev(oid1, DEFAULT_ABBREV));
+               abbrev2 = xstrdup(find_unique_abbrev(oid2, DEFAULT_ABBREV));

                htmlf("<br/>index %s..%s", abbrev1, abbrev2);
                free(abbrev1);
                free(abbrev2);
                htmlf("<br/>index %s..%s", abbrev1, abbrev2);
                free(abbrev1);
                free(abbrev2);


@@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                        "Bad commit: %s", oid_to_hex(new_rev_oid));
                return;
        }
                        "Bad commit: %s", oid_to_hex(new_rev_oid));
                return;
        }

-       new_tree_oid = &commit->tree->object.oid;
+       new_tree_oid = &commit->maybe_tree->object.oid;

 
        if (old_rev) {
                if (get_oid(old_rev, old_rev_oid)) {
 
        if (old_rev) {
                if (get_oid(old_rev, old_rev_oid)) {


@@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                                "Bad commit: %s", oid_to_hex(old_rev_oid));
                        return;
                }
                                "Bad commit: %s", oid_to_hex(old_rev_oid));
                        return;
                }

-               old_tree_oid = &commit2->tree->object.oid;
+               old_tree_oid = &commit2->maybe_tree->object.oid;

        } else {
                old_tree_oid = NULL;
        }
        } else {
                old_tree_oid = NULL;
        }