Diffstat (limited to 'cgit.c')
| -rw-r--r-- | cgit.c | 25 |
1 files changed, 3 insertions, 22 deletions
@@ -60,8 +60,6 @@ static void process_cached_repolist(const char *path); void repo_config(struct cgit_repo *repo, const char *name, const char *value) { - struct string_list_item *item; - if (!strcmp(name, "name")) repo->name = xstrdup(value); else if (!strcmp(name, "clone-url")) @@ -88,10 +86,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) repo->max_stats = cgit_find_stats_period(value, NULL); else if (!strcmp(name, "module-link")) repo->module_link= xstrdup(value); - else if (!prefixcmp(name, "module-link.")) { - item = string_list_append(&repo->submodules, name + 12); - item->util = xstrdup(value); - } else if (!strcmp(name, "section")) + else if (!strcmp(name, "section")) repo->section = xstrdup(value); else if (!strcmp(name, "readme") && value != NULL) repo->readme = xstrdup(value); @@ -305,7 +300,6 @@ static void querystring_cb(const char *name, const char *value) ctx.qry.period = xstrdup(value); } else if (!strcmp(name, "ss")) { ctx.qry.ssdiff = atoi(value); - ctx.qry.has_ssdiff = 1; } else if (!strcmp(name, "all")) { ctx.qry.show_all = atoi(value); } else if (!strcmp(name, "context")) { @@ -346,6 +340,7 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.max_repodesc_len = 80; ctx->cfg.max_blob_size = 0; ctx->cfg.max_stats = 0; + ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; ctx->cfg.project_list = NULL; ctx->cfg.renamelimit = -1; ctx->cfg.remove_suffix = 0; @@ -423,17 +418,6 @@ char *find_default_branch(struct cgit_repo *repo) return ref; } -static char *guess_defbranch(const char *repo_path) -{ - const char *ref; - unsigned char sha1[20]; - - ref = resolve_ref("HEAD", sha1, 0, NULL); - if (!ref || prefixcmp(ref, "refs/heads/")) - return "master"; - return xstrdup(ref + 11); -} - static int prepare_repo_cmd(struct cgit_context *ctx) { char *tmp; @@ -460,12 +444,10 @@ static int prepare_repo_cmd(struct cgit_context *ctx) } ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); - if (!ctx->repo->defbranch) - ctx->repo->defbranch = guess_defbranch(ctx->repo->path); - if (!ctx->qry.head) { ctx->qry.nohead = 1; ctx->qry.head = find_default_branch(ctx->repo); + ctx->repo->defbranch = ctx->qry.head; } if (!ctx->qry.head) { @@ -489,7 +471,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx) cgit_print_docend(); return 1; } - sort_string_list(&ctx->repo->submodules); cgit_prepare_repo_env(ctx->repo); return 0; } |