From: whydoubt at gmail.com (Jeff Smith)
Subject: [PATCH 3/4] git v2.14: include config.h when needed
Date: Tue, 8 Aug 2017 07:03:04 -0500 [thread overview]
Message-ID: <20170808120305.22938-4-whydoubt@gmail.com> (raw)
In-Reply-To: <20170808120305.22938-1-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 <whydoubt at gmail.com>
---
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
next prev parent reply other threads:[~2017-08-08 12:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-08 12:03 [PATCH 0/4] Advance to git 2.14 whydoubt
2017-08-08 12:03 ` [PATCH 1/4] git: update to v2.14 whydoubt
2017-08-08 12:03 ` [PATCH 2/4] git v2.14: use object_id structure for hashes whydoubt
2017-08-08 12:03 ` whydoubt [this message]
2017-08-08 12:03 ` [PATCH 4/4] git v2.14: change how ignore-case is specified whydoubt
2017-08-08 12:54 ` [PATCH 0/4] Advance to git 2.14 john
2017-08-10 0:02 ` [PATCH v2] git: update to v2.14 whydoubt
2017-08-10 6:16 ` list
2017-08-10 10:32 ` john
2017-08-10 13:58 ` Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170808120305.22938-4-whydoubt@gmail.com \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).