git: update to v2.46.0

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 75d9926539fb78f0976a3ce7ea34e3b6176bd8fb..2efa96235a5ffb2552209800e5d40392ca05a1c3 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
  *   (see COPYING for full license text)
  */
 

+#define USE_THE_REPOSITORY_VARIABLE
+

 #include "cgit.h"
 #include "cache.h"
 #include "cmd.h"
 #include "cgit.h"
 #include "cache.h"
 #include "cmd.h"


@@ -143,6 +145,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.root_readme = xstrdup(value);
        else if (!strcmp(name, "css"))
                string_list_append(&ctx.cfg.css, xstrdup(value));
                ctx.cfg.root_readme = xstrdup(value);
        else if (!strcmp(name, "css"))
                string_list_append(&ctx.cfg.css, xstrdup(value));

+       else if (!strcmp(name, "js"))
+               string_list_append(&ctx.cfg.js, xstrdup(value));

        else if (!strcmp(name, "favicon"))
                ctx.cfg.favicon = xstrdup(value);
        else if (!strcmp(name, "footer"))
        else if (!strcmp(name, "favicon"))
                ctx.cfg.favicon = xstrdup(value);
        else if (!strcmp(name, "footer"))


@@ -471,7 +475,8 @@ static char *find_default_branch(struct cgit_repo *repo)
        info.req_ref = repo->defbranch;
        info.first_ref = NULL;
        info.match = 0;
        info.req_ref = repo->defbranch;
        info.first_ref = NULL;
        info.match = 0;

-       for_each_branch_ref(find_current_ref, &info);
+       refs_for_each_branch_ref(get_main_ref_store(the_repository),
+                                find_current_ref, &info);

        if (info.match)
                ref = info.req_ref;
        else
        if (info.match)
                ref = info.req_ref;
        else


@@ -488,7 +493,8 @@ static char *guess_defbranch(void)
        const char *ref, *refname;
        struct object_id oid;
 
        const char *ref, *refname;
        struct object_id oid;
 

-       ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
+       ref = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
+                                    "HEAD", 0, &oid, NULL);

        if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
                return "master";
        return xstrdup(refname);
        if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
                return "master";
        return xstrdup(refname);


@@ -629,7 +635,7 @@ static int prepare_repo_cmd(int nongit)
                return 1;
        }
 
                return 1;
        }
 

-       if (get_oid(ctx.qry.head, &oid)) {
+       if (repo_get_oid(the_repository, ctx.qry.head, &oid)) {

                char *old_head = ctx.qry.head;
                ctx.qry.head = xstrdup(ctx.repo->defbranch);
                cgit_print_error_page(404, "Not found",
                char *old_head = ctx.qry.head;
                ctx.qry.head = xstrdup(ctx.repo->defbranch);
                cgit_print_error_page(404, "Not found",