aboutsummaryrefslogtreecommitdiffstats
path: root/shared.c
diff options
context:
space:
mode:
authorJeff Smith2017-08-09 19:02:56 -0500
committerJason A. Donenfeld2017-08-10 15:58:24 +0200
commit86a6d358f7a6c2432fde86b9e3c5011a656f20e4 (patch)
tree0f43ea3514fba419d5a5d99cf731f96daa2765c0 /shared.c
parent3d33b46df24d4dee140d0aafb1eba5fffa314cf0 (diff)
downloadcgit-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 'shared.c')
-rw-r--r--shared.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index 13a65a9..df3f611 100644
--- a/shared.c
+++ b/shared.c
@@ -160,7 +160,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
160 160
161 ref = xmalloc(sizeof (struct refinfo)); 161 ref = xmalloc(sizeof (struct refinfo));
162 ref->refname = xstrdup(refname); 162 ref->refname = xstrdup(refname);
163 ref->object = parse_object(oid->hash); 163 ref->object = parse_object(oid);
164 switch (ref->object->type) { 164 switch (ref->object->type) {
165 case OBJ_TAG: 165 case OBJ_TAG:
166 ref->tag = cgit_parse_tag((struct tag *)ref->object); 166 ref->tag = cgit_parse_tag((struct tag *)ref->object);
@@ -360,9 +360,9 @@ void cgit_diff_tree(const struct object_id *old_oid,
360 diff_setup_done(&opt); 360 diff_setup_done(&opt);
361 361
362 if (old_oid && !is_null_oid(old_oid)) 362 if (old_oid && !is_null_oid(old_oid))
363 diff_tree_sha1(old_oid->hash, new_oid->hash, "", &opt); 363 diff_tree_oid(old_oid, new_oid, "", &opt);
364 else 364 else
365 diff_root_tree_sha1(new_oid->hash, "", &opt); 365 diff_root_tree_oid(new_oid, "", &opt);
366 diffcore_std(&opt); 366 diffcore_std(&opt);
367 diff_flush(&opt); 367 diff_flush(&opt);
368 368