author | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 16:46:17 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 16:46:17 (UTC) |
commit | 536c7a1eb201b44b9266babe087cb6f2b75e4a7f (patch) (side-by-side diff) | |
tree | 899ecd47f770b1909d107b0f1c777e8b032b25fc /cgit.c | |
parent | e76a1ea427792aaa331cdec70d7d4ff1fb3422e0 (diff) | |
parent | 797110e39d5d433638c82cf27d584ed9b8b93bb7 (diff) | |
download | cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.zip cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.tar.gz cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.tar.bz2 |
Merge branch 'lh/section-from-path'
Conflicts:
scan-tree.c
-rw-r--r-- | cgit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -188,16 +188,18 @@ void config_cb(const char *name, const char *value) else if (!strcmp(name, "scan-path")) if (!ctx.cfg.nocache && ctx.cfg.cache_size) process_cached_repolist(expand_macros(value)); else if (ctx.cfg.project_list) scan_projects(expand_macros(value), ctx.cfg.project_list, repo_config); else scan_tree(expand_macros(value), repo_config); + else if (!strcmp(name, "section-from-path")) + ctx.cfg.section_from_path = atoi(value); else if (!strcmp(name, "source-filter")) ctx.cfg.source_filter = new_filter(value, 1); else if (!strcmp(name, "summary-log")) ctx.cfg.summary_log = atoi(value); else if (!strcmp(name, "summary-branches")) ctx.cfg.summary_branches = atoi(value); else if (!strcmp(name, "summary-tags")) ctx.cfg.summary_tags = atoi(value); |