diff options
author | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
commit | 6c66430e9658616e118d10af9c9ab48858a04e67 (patch) | |
tree | 2e83a411ed158f151df085c7f3836827753aecf7 /shared.c | |
parent | 42f8840323a219d3eca59a7a2a388c3a28eeb8fb (diff) | |
parent | fa146ccabdd0de746a7076f0630af550e43d9088 (diff) | |
download | cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.gz cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.xz |
Merge tag 'v1.2.2' into local
CGIT v1.2.2
Diffstat (limited to 'shared.c')
-rw-r--r-- | shared.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -58,6 +58,7 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->homepage = NULL; ret->section = ctx.cfg.section; ret->snapshots = ctx.cfg.snapshots; + ret->enable_blame = ctx.cfg.enable_blame; ret->enable_commit_graph = ctx.cfg.enable_commit_graph; ret->enable_log_filecount = ctx.cfg.enable_log_filecount; ret->enable_log_linecount = ctx.cfg.enable_log_linecount; @@ -161,7 +162,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_ ref = xmalloc(sizeof (struct refinfo)); ref->refname = xstrdup(refname); - ref->object = parse_object(oid); + ref->object = parse_object(the_repository, oid); switch (ref->object->type) { case OBJ_TAG: ref->tag = cgit_parse_tag((struct tag *)ref->object); @@ -325,7 +326,7 @@ int cgit_diff_files(const struct object_id *old_oid, diff_params.flags |= XDF_IGNORE_WHITESPACE; emit_params.ctxlen = context > 0 ? context : 3; emit_params.flags = XDL_EMIT_FUNCNAMES; - emit_cb.outf = filediff_cb; + emit_cb.out_line = filediff_cb; emit_cb.priv = fn; xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); if (file1.size) |