summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:43 (GMT)
commit8be8342b4c47df386c6eced39922595d7dfdccc9 (patch)
tree3fed16dd1602125435cf12a4c150698bb13bdf59 /builtin/index-pack.c
parent157ee050615192d579a358723563e7f785d676ff (diff)
parent1752cbbc447c08230c478239e185db9fa2d4a515 (diff)
downloadgit-8be8342b4c47df386c6eced39922595d7dfdccc9.zip
git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.gz
git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.bz2
Merge branch 'po/object-id'
Conversion from uchar[20] to struct object_id continues. * po/object-id: sha1_file: rename hash_sha1_file_literally sha1_file: convert write_loose_object to object_id sha1_file: convert force_object_loose to object_id sha1_file: convert write_sha1_file to object_id notes: convert write_notes_tree to object_id notes: convert combine_notes_* to object_id commit: convert commit_tree* to object_id match-trees: convert splice_tree to object_id cache: clear whole hash buffer with oidclr sha1_file: convert hash_sha1_file to object_id dir: convert struct sha1_stat to use object_id sha1_file: convert pretend_sha1_file to object_id
Diffstat (limited to 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 5ebd370..16edfeb 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -958,9 +958,8 @@ static void resolve_delta(struct object_entry *delta_obj,
free(delta_data);
if (!result->data)
bad_object(delta_obj->idx.offset, _("failed to apply delta"));
- hash_sha1_file(result->data, result->size,
- typename(delta_obj->real_type),
- delta_obj->idx.oid.hash);
+ hash_object_file(result->data, result->size,
+ typename(delta_obj->real_type), &delta_obj->idx.oid);
sha1_object(result->data, NULL, result->size, delta_obj->real_type,
&delta_obj->idx.oid);
counter_lock();