Merge branch 'tg/reset-hard-show-head-with-pretty'

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 5ebd370c56d2611494868ad1cf5957b5e9ea636e..16edfebf632a7938889d35d4d6332a0d7e814ae2 100644 (file)
--- 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();