git: update to v2.39.2

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index c4320f044d4bae6df164719432c650b028bd4419..57d70974c50fbd0ade407d8fd46b0ee480d046b1 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -142,7 +142,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"))
        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"))
        else if (!strcmp(name, "favicon"))
                ctx.cfg.favicon = xstrdup(value);
        else if (!strcmp(name, "footer"))


@@ -237,9 +239,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);
                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);
                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));
                ctx.cfg.max_commit_count = atoi(value);
        else if (!strcmp(name, "project-list"))
                ctx.cfg.project_list = xstrdup(expand_macros(value));


@@ -324,11 +328,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.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")) {
        } 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")) {
        } else if (!strcmp(name, "ofs")) {
                ctx.qry.ofs = atoi(value);
        } else if (!strcmp(name, "path")) {


@@ -376,7 +380,6 @@ static void prepare_context(void)
        ctx.cfg.case_sensitive_sort = 1;
        ctx.cfg.branch_sort = 0;
        ctx.cfg.commit_sort = 0;
        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;
        ctx.cfg.logo = "/cgit.png";
        ctx.cfg.favicon = "/favicon.ico";
        ctx.cfg.local_time = 0;


@@ -428,7 +431,7 @@ static void prepare_context(void)
        ctx.page.modified = time(NULL);
        ctx.page.expires = ctx.page.modified;
        ctx.page.etag = NULL;
        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)
        if (ctx.env.script_name)
                ctx.cfg.script_name = xstrdup(ctx.env.script_name);
        if (ctx.env.query_string)


@@ -507,9 +510,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) {
        /* 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);
                        *ref = xstrdup(repo->defbranch);
                else
                        *ref = xstrndup(readme, colon - readme);


@@ -992,9 +997,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], "--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) ||
                } else if (skip_prefix(argv[i], "--ofs=", &arg)) {
                        ctx.qry.ofs = atoi(arg);
                } else if (skip_prefix(argv[i], "--scan-tree=", &arg) ||


@@ -1037,7 +1042,7 @@ static int calc_ttl(void)
        if (!strcmp(ctx.qry.page, "snapshot"))
                return ctx.cfg.cache_snapshot_ttl;
 
        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)
                return ctx.cfg.cache_static_ttl;
 
        if (ctx.qry.has_symref)