about summary refs log tree commit diff stats
path: root/shared.c
diff options
context:
space:
mode:
authorChristian Hesse2016-01-05 07:38:53 +0100
committerJason A. Donenfeld2016-01-13 17:12:17 +0100
commit559ab5ecc4445c8477ecf62c9fc97efa412dd562 (patch)
treeef19237ed99976f886ad6ca660f9a9961b4e656a /shared.c
parentui-repolist: initialize char *buf to NULL (diff)
downloadcgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.tar.gz
cgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.zip
git: update to v2.7.0
Update to git version v2.7.0.

* Upstream commit ed1c9977cb1b63e4270ad8bdf967a2d02580aa08 (Remove
  get_object_hash.) changed API:

  Convert all instances of get_object_hash to use an appropriate
  reference to the hash member of the oid member of struct object.
  This provides no functional change, as it is essentially a macro
  substitution.

Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'shared.c')
-rw-r--r--shared.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared.c b/shared.c index e216c64..42b2ddc 100644 --- a/shared.c +++ b/shared.c
@@ -402,8 +402,8 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
402 unsigned char *old_sha1 = NULL; 402 unsigned char *old_sha1 = NULL;
403 403
404 if (commit->parents) 404 if (commit->parents)
405 old_sha1 = commit->parents->item->object.sha1; 405 old_sha1 = commit->parents->item->object.oid.hash;
406 cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix, 406 cgit_diff_tree(old_sha1, commit->object.oid.hash, fn, prefix,
407 ctx.qry.ignorews); 407 ctx.qry.ignorews);
408} 408}
409 409