summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2009-08-09 11:46:34 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-09 11:46:34 (UTC)
commitdb8b8cb9467625cb8d9ecb67863aa67590e59cc0 (patch) (side-by-side diff)
treed27644fc1b98ec6365e74f3ba40c19f78f8a287f /cgit.c
parentdb6303b58883c4417f5bcc0c1ee34fed6553dca3 (diff)
parent537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4 (diff)
downloadcgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.zip
cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.gz
cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.bz2
Merge branch 'lh/about'
Conflicts: cgit.h
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index dbec196..7b228af 100644
--- a/cgit.c
+++ b/cgit.c
@@ -97,12 +97,14 @@ void config_cb(const char *name, const char *value)
else if (!strcmp(name, "cache-repo-ttl"))
ctx.cfg.cache_repo_ttl = atoi(value);
else if (!strcmp(name, "cache-static-ttl"))
ctx.cfg.cache_static_ttl = atoi(value);
else if (!strcmp(name, "cache-dynamic-ttl"))
ctx.cfg.cache_dynamic_ttl = atoi(value);
+ else if (!strcmp(name, "about-filter"))
+ ctx.cfg.about_filter = new_filter(value, 0);
else if (!strcmp(name, "commit-filter"))
ctx.cfg.commit_filter = new_filter(value, 0);
else if (!strcmp(name, "embedded"))
ctx.cfg.embedded = atoi(value);
else if (!strcmp(name, "max-message-length"))
ctx.cfg.max_msg_len = atoi(value);
@@ -155,12 +157,14 @@ void config_cb(const char *name, const char *value)
else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
else if (ctx.repo && !strcmp(name, "repo.max-stats"))
ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
else if (ctx.repo && !strcmp(name, "repo.module-link"))
ctx.repo->module_link= xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.about-filter"))
+ ctx.repo->about_filter = new_filter(value, 0);
else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
ctx.repo->commit_filter = new_filter(value, 0);
else if (ctx.repo && !strcmp(name, "repo.source-filter"))
ctx.repo->source_filter = new_filter(value, 1);
else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
if (*value == '/')