extra-head-content: introduce another option for meta tags

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index df3f61160784eb7ab7c3aea9f185bdc6fb0d35de..f7b64cf317ced6a7dd5ce33fce48e74c149c0e5f 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -53,6 +53,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = cgit_default_repo_desc;
+       ret->extra_head_content = NULL;
        ret->owner = NULL;
        ret->homepage = NULL;
        ret->section = ctx.cfg.section;
@@ -239,7 +240,7 @@ static int load_mmfile(mmfile_t *file, const struct object_id *oid)
                file->ptr = (char *)"";
                file->size = 0;
        } else {
-               file->ptr = read_sha1_file(oid->hash, &type,
+               file->ptr = read_object_file(oid, &type,
                                           (unsigned long *)&file->size);
        }
        return 1;
@@ -346,7 +347,7 @@ void cgit_diff_tree(const struct object_id *old_oid,
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;
-       DIFF_OPT_SET(&opt, RECURSIVE);
+       opt.flags.recursive = 1;
        if (ignorews)
                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
        opt.format_callback = cgit_diff_tree_cb;
@@ -390,6 +391,9 @@ int cgit_parse_snapshots_mask(const char *str)
        if (atoi(str))
                return 1;
 
+       if (strcmp(str, "all") == 0)
+               return INT_MAX;
+
        string_list_split(&tokens, str, ' ', -1);
        string_list_remove_empty_items(&tokens, 0);
 
@@ -397,7 +401,7 @@ int cgit_parse_snapshots_mask(const char *str)
                for (f = cgit_snapshot_formats; f->suffix; f++) {
                        if (!strcmp(item->string, f->suffix) ||
                            !strcmp(item->string, f->suffix + 1)) {
-                               rv |= f->bit;
+                               rv |= cgit_snapshot_format_bit(f);
                                break;
                        }
                }