mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

object-file API: have hash_object_file() take "enum object_type"

Browse Source 
Change the hash_object_file() function to take an "enum
object_type".

Since a preceding commit all of its callers are passing either
"{commit,tree,blob,tag}_type", or the result of a call to type_name(),
the parse_object() caller that would pass NULL is now using
stream_object_signature().

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-02-05 00:48:32 +01:00
committed by Junio C Hamano
parent 0ff7b4f976
commit 44439c1c58
16 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apply.c
View File

@ -3157,7 +3157,7 @@ static int apply_binary(struct apply_state *state,
* See if the old one matches what the patch
* applies to.
*/
hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
hash_object_file(the_hash_algo, img->buf, img->len, OBJ_BLOB,
&oid);
if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix))
return error(_("the patch applies to '%s' (%s), "
@ -3203,7 +3203,7 @@ static int apply_binary(struct apply_state *state,
name);
/* verify that the result matches */
hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
hash_object_file(the_hash_algo, img->buf, img->len, OBJ_BLOB,
&oid);
if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix))
return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),