about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2009-12-08 18:30:02 +0100
committerLars Hjemli2009-12-08 18:30:02 +0100
commit5c34d96f7e000eb47418ac9e39dabf92b767c9f2 (patch)
treeb5db40ff125329f897cef3b81131a637fb3a56af
parentMerge branch 'stable' (diff)
parentDon't crash when a repo-specific readme file is used (diff)
downloadcgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.tar.gz
cgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.zip
Merge branch 'stable'
-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
@@ -68,9 +68,9 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
68 repo->section = xstrdup(value); 68 repo->section = xstrdup(value);
69 else if (!strcmp(name, "readme") && value != NULL) { 69 else if (!strcmp(name, "readme") && value != NULL) {
70 if (*value == '/') 70 if (*value == '/')
71 ctx.repo->readme = xstrdup(value); 71 repo->readme = xstrdup(value);
72 else 72 else
73 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); 73 repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
74 } else if (ctx.cfg.enable_filter_overrides) { 74 } else if (ctx.cfg.enable_filter_overrides) {
75 if (!strcmp(name, "about-filter")) 75 if (!strcmp(name, "about-filter"))
76 repo->about_filter = new_filter(value, 0); 76 repo->about_filter = new_filter(value, 0);