summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-12-08 17:30:02 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-12-08 17:30:02 (UTC)
commit5c34d96f7e000eb47418ac9e39dabf92b767c9f2 (patch) (side-by-side diff)
treeb5db40ff125329f897cef3b81131a637fb3a56af
parente633ccf714eb423c4522924c3b611dac2e176c5e (diff)
parentf2bf0a05280edddb4961214adfd7b440191737e2 (diff)
downloadcgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.zip
cgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.tar.gz
cgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c4
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
@@ -65,15 +65,15 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
else if (!strcmp(name, "module-link"))
repo->module_link= xstrdup(value);
else if (!strcmp(name, "section"))
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);
else if (!strcmp(name, "commit-filter"))
repo->commit_filter = new_filter(value, 0);
else if (!strcmp(name, "source-filter"))