git: update to v2.22.0

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index df8ad82ca4914a5b469986545f1543bf1480f511..84eb17d6470d718dd99fbe9eb5636967bbaf2226 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -84,7 +84,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
        html("</table>\n");
 }
 
-static void print_object(const struct object_id *oid, char *path, const char *basename, const char *rev)
+static void print_object(const struct object_id *oid, const char *path, const char *basename, const char *rev)
 {
        enum object_type type;
        char *buf;
@@ -110,7 +110,7 @@ static void print_object(const struct object_id *oid, char *path, const char *ba
        htmlf("blob: %s (", oid_to_hex(oid));
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        rev, path);
-       if (ctx.cfg.enable_blame) {
+       if (ctx.repo->enable_blame) {
                html(") (");
                cgit_blame_link("blame", NULL, NULL, ctx.qry.head,
                                rev, path);
@@ -185,8 +185,8 @@ static void write_tree_link(const struct object_id *oid, char *name,
                tree_ctx.name = NULL;
                tree_ctx.count = 0;
 
-               read_tree_recursive(tree, "", 0, 1, &paths, single_tree_cb,
-                                   &tree_ctx);
+               read_tree_recursive(the_repository, tree, "", 0, 1,
+                       &paths, single_tree_cb, &tree_ctx);
 
                if (tree_ctx.count != 1)
                        break;
@@ -251,7 +251,7 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
        if (!S_ISGITLINK(mode))
                cgit_plain_link("plain", NULL, "button", ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);
-       if (!S_ISDIR(mode) && ctx.cfg.enable_blame)
+       if (!S_ISDIR(mode) && ctx.repo->enable_blame)
                cgit_blame_link("blame", NULL, "button", ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);
        html("</td></tr>\n");
@@ -279,7 +279,7 @@ static void ls_tail(void)
        cgit_print_layout_end();
 }
 
-static void ls_tree(const struct object_id *oid, char *path, struct walk_tree_context *walk_tree_ctx)
+static void ls_tree(const struct object_id *oid, const char *path, struct walk_tree_context *walk_tree_ctx)
 {
        struct tree *tree;
        struct pathspec paths = {
@@ -294,7 +294,8 @@ static void ls_tree(const struct object_id *oid, char *path, struct walk_tree_co
        }
 
        ls_head();
-       read_tree_recursive(tree, "", 0, 1, &paths, ls_item, walk_tree_ctx);
+       read_tree_recursive(the_repository, tree, "", 0, 1,
+               &paths, ls_item, walk_tree_ctx);
        ls_tail();
 }
 
@@ -373,7 +374,8 @@ void cgit_print_tree(const char *rev, char *path)
                goto cleanup;
        }
 
-       read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+       read_tree_recursive(the_repository, commit->maybe_tree, "", 0, 0,
+               &paths, walk_tree, &walk_tree_ctx);
        if (walk_tree_ctx.state == 1)
                ls_tail();
        else if (walk_tree_ctx.state == 2)