git: update to v2.46.0

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 08f3f1da4b40d4b294f4c453e1b77bdd7d1828df..84da86ef5533b5f1fdfc9e7e41d548459cc1deeb 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -10,6 +10,7 @@
 #include "scan-tree.h"
 #include "configfile.h"
 #include "html.h"
 #include "scan-tree.h"
 #include "configfile.h"
 #include "html.h"

+#include <config.h>

 
 /* return 1 if path contains a objects/ directory and a HEAD file */
 static int is_git_dir(const char *path)
 
 /* return 1 if path contains a objects/ directory and a HEAD file */
 static int is_git_dir(const char *path)


@@ -48,12 +49,12 @@ out:
 static struct cgit_repo *repo;
 static repo_config_fn config_fn;
 
 static struct cgit_repo *repo;
 static repo_config_fn config_fn;
 

-static void repo_config(const char *name, const char *value)
+static void scan_tree_repo_config(const char *name, const char *value)

 {
        config_fn(repo, name, value);
 }
 
 {
        config_fn(repo, name, value);
 }
 

-static int gitconfig_config(const char *key, const char *value, void *cb)
+static int gitconfig_config(const char *key, const char *value, const struct config_context *, void *cb)

 {
        const char *name;
 
 {
        const char *name;
 


@@ -178,7 +179,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
 
        strbuf_addstr(path, "cgitrc");
        if (!stat(path->buf, &st))
 
        strbuf_addstr(path, "cgitrc");
        if (!stat(path->buf, &st))

-               parse_configfile(path->buf, &repo_config);
+               parse_configfile(path->buf, &scan_tree_repo_config);

 
        strbuf_release(&rel);
 }
 
        strbuf_release(&rel);
 }