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>
This commit is contained in:
Jeff Smith
2017-08-09 19:02:56 -05:00
committed by Jason A. Donenfeld
parent 3d33b46df2
commit 86a6d358f7
14 changed files with 44 additions and 43 deletions

View File

@ -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);
}