From mboxrd@z Thu Jan 1 00:00:00 1970 From: whydoubt at gmail.com (Jeff Smith) Date: Tue, 8 Aug 2017 07:03:04 -0500 Subject: [PATCH 3/4] git v2.14: include config.h when needed In-Reply-To: <20170808120305.22938-1-whydoubt@gmail.com> References: <20170808120305.22938-1-whydoubt@gmail.com> Message-ID: <20170808120305.22938-4-whydoubt@gmail.com> Update to git v2.14: commit b2141fc (config: don't include config.h by default) made it necessary to that config.h be explicitly included when needed. Signed-off-by: Jeff Smith --- scan-tree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scan-tree.c b/scan-tree.c index 08f3f1d..c8d175e 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -10,6 +10,7 @@ #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) @@ -48,7 +49,7 @@ out: 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); } @@ -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)) - parse_configfile(path->buf, &repo_config); + parse_configfile(path->buf, &scan_tree_repo_config); strbuf_release(&rel); } -- 2.9.4