5 files changed, 39 insertions, 13 deletions

diff --git a/cgit.c b/cgit.c
index 90ae124..e281aa9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -170,3 +170,3 @@ void config_cb(const char *name, const char *value)
                 else
-                        scan_tree(value);
+                        scan_tree(value, repo_config);
         else if (!strcmp(name, "source-filter"))
@@ -478,3 +478,3 @@ static int generate_cached_repolist(const char *path, const char *cached_rc)
         idx = cgit_repolist.count;
-        scan_tree(path);
+        scan_tree(path, repo_config);
         print_repolist(f, &cgit_repolist, idx);
@@ -502,3 +502,3 @@ static void process_cached_repolist(const char *path)
                 if (generate_cached_repolist(path, cached_rc))
-                        scan_tree(path);
+                        scan_tree(path, repo_config);
                 return;
@@ -561,3 +561,3 @@ static void cgit_parse_args(int argc, const char **argv)
                         scan++;
-                        scan_tree(argv[i] + 12);
+                        scan_tree(argv[i] + 12, repo_config);
                 }
diff --git a/cgit.h b/cgit.h
index fc7c7d5..3359be9 100644
--- a/cgit.h
+++ b/cgit.h
@@ -81,2 +81,5 @@ struct cgit_repo {
 
+typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
+              const char *value);
+
 struct cgit_repolist {
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index e99c9f7..df494aa 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -328,2 +328,11 @@ repo.url::
 
+REPOSITORY-SPECIFIC CGITRC FILE
+-------------------------------
+When the option 'scan-path' is used to auto-discover git repositories, cgit
+will try to parse the file 'cgitrc' within any found repository. Such a repo-
+specific config file may contain any of the repo-specific options described
+above, except 'repo.url' and 'repo.path'. Also, in a repo-specific config
+file, the 'repo.' prefix is dropped from the config option names.
+
+
 EXAMPLE CGITRC FILE
diff --git a/scan-tree.c b/scan-tree.c
index 67f4550..dbca797 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,2 +1,3 @@
 #include "cgit.h"
+#include "configfile.h"
 #include "html.h"
@@ -37,5 +38,12 @@ static int is_git_dir(const char *path)
 
-static void add_repo(const char *base, const char *path)
-{
         struct cgit_repo *repo;
+repo_config_fn config_fn;
+
+static void repo_config(const char *name, const char *value)
+{
+        config_fn(repo, name, value);
+}
+
+static void add_repo(const char *base, const char *path, repo_config_fn fn)
+{
         struct stat st;
@@ -78,5 +86,11 @@ static void add_repo(const char *base, const char *path)
                 repo->readme = "README.html";
+
+        p = fmt("%s/cgitrc", path);
+        if (!stat(p, &st)) {
+                config_fn = fn;
+                parse_configfile(xstrdup(p), &repo_config);
+        }
 }
 
-static void scan_path(const char *base, const char *path)
+static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
@@ -88,3 +102,3 @@ static void scan_path(const char *base, const char *path)
         if (is_git_dir(path)) {
-                add_repo(base, path);
+                add_repo(base, path, fn);
                 return;
@@ -92,3 +106,3 @@ static void scan_path(const char *base, const char *path)
         if (is_git_dir(fmt("%s/.git", path))) {
-                add_repo(base, fmt("%s/.git", path));
+                add_repo(base, fmt("%s/.git", path), fn);
                 return;
@@ -122,3 +136,3 @@ static void scan_path(const char *base, const char *path)
                 if (S_ISDIR(st.st_mode))
-                        scan_path(base, buf);
+                        scan_path(base, buf, fn);
                 free(buf);
@@ -128,5 +142,5 @@ static void scan_path(const char *base, const char *path)
 
-void scan_tree(const char *path)
+void scan_tree(const char *path, repo_config_fn fn)
 {
-        scan_path(path, path);
+        scan_path(path, path, fn);
 }
diff --git a/scan-tree.h b/scan-tree.h
index b103b16..11539f4 100644
--- a/scan-tree.h
+++ b/scan-tree.h
@@ -2,2 +2,2 @@
 
-extern void scan_tree(const char *path);
+extern void scan_tree(const char *path, repo_config_fn fn);