git: update to v2.46.0

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 2910d4b861d76df28b14f6712d30e3568f4ab65b..2efa96235a5ffb2552209800e5d40392ca05a1c3 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
+#define USE_THE_REPOSITORY_VARIABLE
+
 #include "cgit.h"
 #include "cache.h"
 #include "cmd.h"
@@ -19,6 +21,16 @@
 
 const char *cgit_version = CGIT_VERSION;
 
+__attribute__((constructor))
+static void constructor_environment()
+{
+       /* Do not look in /etc/ for gitconfig and gitattributes. */
+       setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
+       setenv("GIT_ATTR_NOSYSTEM", "1", 1);
+       unsetenv("HOME");
+       unsetenv("XDG_CONFIG_HOME");
+}
+
 static void add_mimetype(const char *name, const char *value)
 {
        struct string_list_item *item;
@@ -132,7 +144,9 @@ static void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "root-readme"))
                ctx.cfg.root_readme = xstrdup(value);
        else if (!strcmp(name, "css"))
-               ctx.cfg.css = xstrdup(value);
+               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"))
@@ -227,9 +241,11 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.max_repodesc_len = atoi(value);
        else if (!strcmp(name, "max-blob-size"))
                ctx.cfg.max_blob_size = atoi(value);
-       else if (!strcmp(name, "max-repo-count"))
+       else if (!strcmp(name, "max-repo-count")) {
                ctx.cfg.max_repo_count = atoi(value);
-       else if (!strcmp(name, "max-commit-count"))
+               if (ctx.cfg.max_repo_count <= 0)
+                       ctx.cfg.max_repo_count = INT_MAX;
+       } else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
        else if (!strcmp(name, "project-list"))
                ctx.cfg.project_list = xstrdup(expand_macros(value));
@@ -314,11 +330,11 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.head = xstrdup(value);
                ctx.qry.has_symref = 1;
        } else if (!strcmp(name, "id")) {
-               ctx.qry.sha1 = xstrdup(value);
-               ctx.qry.has_sha1 = 1;
+               ctx.qry.oid = xstrdup(value);
+               ctx.qry.has_oid = 1;
        } else if (!strcmp(name, "id2")) {
-               ctx.qry.sha2 = xstrdup(value);
-               ctx.qry.has_sha1 = 1;
+               ctx.qry.oid2 = xstrdup(value);
+               ctx.qry.has_oid = 1;
        } else if (!strcmp(name, "ofs")) {
                ctx.qry.ofs = atoi(value);
        } else if (!strcmp(name, "path")) {
@@ -366,7 +382,6 @@ static void prepare_context(void)
        ctx.cfg.case_sensitive_sort = 1;
        ctx.cfg.branch_sort = 0;
        ctx.cfg.commit_sort = 0;
-       ctx.cfg.css = "/cgit.css";
        ctx.cfg.logo = "/cgit.png";
        ctx.cfg.favicon = "/favicon.ico";
        ctx.cfg.local_time = 0;
@@ -418,7 +433,7 @@ static void prepare_context(void)
        ctx.page.modified = time(NULL);
        ctx.page.expires = ctx.page.modified;
        ctx.page.etag = NULL;
-       string_list_init(&ctx.cfg.mimetypes, 1);
+       string_list_init_dup(&ctx.cfg.mimetypes);
        if (ctx.env.script_name)
                ctx.cfg.script_name = xstrdup(ctx.env.script_name);
        if (ctx.env.query_string)
@@ -460,7 +475,8 @@ static char *find_default_branch(struct cgit_repo *repo)
        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
@@ -477,7 +493,8 @@ static char *guess_defbranch(void)
        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);
@@ -497,9 +514,11 @@ static inline void parse_readme(const char *readme, char **filename, char **ref,
        /* Check if the readme is tracked in the git repo. */
        colon = strchr(readme, ':');
        if (colon && strlen(colon) > 1) {
-               /* If it starts with a colon, we want to use
-                * the default branch */
-               if (colon == readme && repo->defbranch)
+               /* If it starts with a colon, we want to use head given
+                * from query or the default branch */
+               if (colon == readme && ctx.qry.head)
+                       *ref = xstrdup(ctx.qry.head);
+               else if (colon == readme && repo->defbranch)
                        *ref = xstrdup(repo->defbranch);
                else
                        *ref = xstrndup(readme, colon - readme);
@@ -565,18 +584,13 @@ static void prepare_repo_env(int *nongit)
        /* The path to the git repository. */
        setenv("GIT_DIR", ctx.repo->path, 1);
 
-       /* Do not look in /etc/ for gitconfig and gitattributes. */
-       setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
-       setenv("GIT_ATTR_NOSYSTEM", "1", 1);
-       unsetenv("HOME");
-       unsetenv("XDG_CONFIG_HOME");
-
        /* Setup the git directory and initialize the notes system. Both of these
         * load local configuration from the git repository, so we do them both while
         * the HOME variables are unset. */
        setup_git_directory_gently(nongit);
-       init_display_notes(NULL);
+       load_display_notes(NULL);
 }
+
 static int prepare_repo_cmd(int nongit)
 {
        struct object_id oid;
@@ -621,7 +635,7 @@ static int prepare_repo_cmd(int nongit)
                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",
@@ -987,9 +1001,9 @@ static void cgit_parse_args(int argc, const char **argv)
                } else if (skip_prefix(argv[i], "--head=", &arg)) {
                        ctx.qry.head = xstrdup(arg);
                        ctx.qry.has_symref = 1;
-               } else if (skip_prefix(argv[i], "--sha1=", &arg)) {
-                       ctx.qry.sha1 = xstrdup(arg);
-                       ctx.qry.has_sha1 = 1;
+               } else if (skip_prefix(argv[i], "--oid=", &arg)) {
+                       ctx.qry.oid = xstrdup(arg);
+                       ctx.qry.has_oid = 1;
                } else if (skip_prefix(argv[i], "--ofs=", &arg)) {
                        ctx.qry.ofs = atoi(arg);
                } else if (skip_prefix(argv[i], "--scan-tree=", &arg) ||
@@ -1032,7 +1046,7 @@ static int calc_ttl(void)
        if (!strcmp(ctx.qry.page, "snapshot"))
                return ctx.cfg.cache_snapshot_ttl;
 
-       if (ctx.qry.has_sha1)
+       if (ctx.qry.has_oid)
                return ctx.cfg.cache_static_ttl;
 
        if (ctx.qry.has_symref)