diff options
author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:30:02 +0100 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:30:02 +0100 |
commit | 5c34d96f7e000eb47418ac9e39dabf92b767c9f2 (patch) | |
tree | b5db40ff125329f897cef3b81131a637fb3a56af | |
parent | Merge branch 'stable' (diff) | |
parent | Don't crash when a repo-specific readme file is used (diff) | |
download | cgit-pink-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.tar.gz cgit-pink-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.zip |
Merge branch 'stable'
-rw-r--r-- | cgit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c index a17f40d..bfde9f9 100644 --- a/cgit.c +++ b/cgit.c @@ -68,9 +68,9 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) repo->section = xstrdup(value); else if (!strcmp(name, "readme") && value != NULL) { if (*value == '/') - ctx.repo->readme = xstrdup(value); + repo->readme = xstrdup(value); 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) { if (!strcmp(name, "about-filter")) repo->about_filter = new_filter(value, 0); |