aboutsummaryrefslogtreecommitdiff
path: root/scan-tree.c
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2012-07-11 05:32:45 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2012-07-12 20:01:46 +0200
commitfc9181ff3d3ebbe0159871f6a49438e60bb17f58 (patch)
treea2b619e91112c9e8aaf03623a20f8e5c1aa36797 /scan-tree.c
parentb56be4ba3a942dd1978fe4bfecd9afc35aab0027 (diff)
downloadcgit-fc9181ff3d3ebbe0159871f6a49438e60bb17f58.tar.gz
cgit-fc9181ff3d3ebbe0159871f6a49438e60bb17f58.tar.bz2
cgit-fc9181ff3d3ebbe0159871f6a49438e60bb17f58.zip
scan-tree: Support gitweb.category.
Use gitweb.category from git config to determine repo's section, if option is enabled.
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 3d4e417..50eedea 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -49,6 +49,7 @@ struct cgit_repo *repo;
repo_config_fn config_fn;
char *owner;
char *desc;
+char *section;
static void repo_config(const char *name, const char *value)
{
@@ -61,6 +62,8 @@ static int gitweb_config(const char *key, const char *value, void *cb)
owner = xstrdup(value);
else if (ctx.cfg.enable_gitweb_desc && !strcmp(key, "gitweb.description"))
desc = xstrdup(value);
+ else if (ctx.cfg.enable_gitweb_section && !strcmp(key, "gitweb.category"))
+ section = xstrdup(value);
return 0;
}
@@ -95,6 +98,7 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
owner = NULL;
desc = NULL;
+ section = NULL;
git_config_from_file(gitweb_config, fmt("%s/config", path), NULL);
if (base == path)
@@ -137,6 +141,8 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
if (!stat(p, &st))
repo->readme = "README.html";
}
+ if (section)
+ repo->section = section;
if (ctx.cfg.section_from_path) {
n = ctx.cfg.section_from_path;
if (n > 0) {