diff options
| author | Patryk Obara <patryk.obara@gmail.com> | 2018-01-28 00:13:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-30 18:42:36 (GMT) |
| commit | f070faccc1a446e44463560add8434efa8c6bed1 (patch) | |
| tree | bedd32ac2a7f86e139b4c0b9114bba7dd7cbaa83 /apply.c | |
| parent | 4b33e60201c12f3a68441807444e3726853a3960 (diff) | |
| download | git-f070faccc1a446e44463560add8434efa8c6bed1.zip git-f070faccc1a446e44463560add8434efa8c6bed1.tar.gz git-f070faccc1a446e44463560add8434efa8c6bed1.tar.bz2 | |
sha1_file: convert hash_sha1_file to object_id
Convert the declaration and definition of hash_sha1_file to use
struct object_id and adjust all function calls.
Rename this function to hash_object_file.
Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.c')
| -rw-r--r-- | apply.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3154,7 +3154,7 @@ static int apply_binary(struct apply_state *state, * See if the old one matches what the patch * applies to. */ - hash_sha1_file(img->buf, img->len, blob_type, oid.hash); + hash_object_file(img->buf, img->len, blob_type, &oid); if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix)) return error(_("the patch applies to '%s' (%s), " "which does not match the " @@ -3199,7 +3199,7 @@ static int apply_binary(struct apply_state *state, name); /* verify that the result matches */ - hash_sha1_file(img->buf, img->len, blob_type, oid.hash); + hash_object_file(img->buf, img->len, blob_type, &oid); if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix)) return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"), name, patch->new_sha1_prefix, oid_to_hex(&oid)); |