about summary refs log tree commit diff stats
path: root/ui-diff.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 /ui-diff.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 'ui-diff.c')
-rw-r--r--ui-diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui-diff.c b/ui-diff.c index 5d18296..52ed942 100644 --- a/ui-diff.c +++ b/ui-diff.c
@@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
413 "Bad commit: %s", sha1_to_hex(new_rev_sha1)); 413 "Bad commit: %s", sha1_to_hex(new_rev_sha1));
414 return; 414 return;
415 } 415 }
416 new_tree_sha1 = commit->tree->object.sha1; 416 new_tree_sha1 = commit->tree->object.oid.hash;
417 417
418 if (old_rev) { 418 if (old_rev) {
419 if (get_sha1(old_rev, old_rev_sha1)) { 419 if (get_sha1(old_rev, old_rev_sha1)) {
@@ -422,7 +422,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
422 return; 422 return;
423 } 423 }
424 } else if (commit->parents && commit->parents->item) { 424 } else if (commit->parents && commit->parents->item) {
425 hashcpy(old_rev_sha1, commit->parents->item->object.sha1); 425 hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash);
426 } else { 426 } else {
427 hashclr(old_rev_sha1); 427 hashclr(old_rev_sha1);
428 } 428 }
@@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
434 "Bad commit: %s", sha1_to_hex(old_rev_sha1)); 434 "Bad commit: %s", sha1_to_hex(old_rev_sha1));
435 return; 435 return;
436 } 436 }
437 old_tree_sha1 = commit2->tree->object.sha1; 437 old_tree_sha1 = commit2->tree->object.oid.hash;
438 } else { 438 } else {
439 old_tree_sha1 = NULL; 439 old_tree_sha1 = NULL;
440 } 440 }