diff options
| author | Jeff Smith <whydoubt@gmail.com> | 2017-08-09 19:02:56 -0500 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-08-10 15:58:24 +0200 |
| commit | 86a6d358f7a6c2432fde86b9e3c5011a656f20e4 (patch) | |
| tree | 0f43ea3514fba419d5a5d99cf731f96daa2765c0 /scan-tree.c | |
| parent | 3d33b46df24d4dee140d0aafb1eba5fffa314cf0 (diff) | |
| download | cgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.tar.gz cgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.tar.bz2 cgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.zip | |
git: update to v2.14
Numerous changes were made to git functions to use an object_id
structure rather than sending sha1 hashes as raw unsigned character
arrays. The functions that affect cgit are: parse_object,
lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect,
diff_root_tree_sha1, diff_tree_sha1, and format_display_notes.
Commit b2141fc (config: don't include config.h by default) made it
necessary to that config.h be explicitly included when needed.
Commit 07a3d41 (grep: remove regflags from the public grep_opt API)
removed one way of specifying the ignore-case grep option.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Diffstat (limited to 'scan-tree.c')
| -rw-r--r-- | scan-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scan-tree.c b/scan-tree.c index 08f3f1d..6a2f65a 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); } |