Merge branch 'stable'

This commit is contained in:
Lars Hjemli 2009-12-08 18:30:02 +01:00
commit 5c34d96f7e

4
cgit.c
View File

@ -68,9 +68,9 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
repo->section = xstrdup(value); repo->section = xstrdup(value);
else if (!strcmp(name, "readme") && value != NULL) { else if (!strcmp(name, "readme") && value != NULL) {
if (*value == '/') if (*value == '/')
ctx.repo->readme = xstrdup(value); repo->readme = xstrdup(value);
else else
ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
} else if (ctx.cfg.enable_filter_overrides) { } else if (ctx.cfg.enable_filter_overrides) {
if (!strcmp(name, "about-filter")) if (!strcmp(name, "about-filter"))
repo->about_filter = new_filter(value, 0); repo->about_filter = new_filter(value, 0);