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
builtin/index-pack.c
View File

@ -970,7 +970,7 @@ static struct base_data *resolve_delta(struct object_entry *delta_obj,
if (!result_data)
bad_object(delta_obj->idx.offset, _("failed to apply delta"));
hash_object_file(the_hash_algo, result_data, result_size,
type_name(delta_obj->real_type), &delta_obj->idx.oid);
delta_obj->real_type, &delta_obj->idx.oid);
sha1_object(result_data, NULL, result_size, delta_obj->real_type,
&delta_obj->idx.oid);
@ -1413,7 +1413,7 @@ static void fix_unresolved_deltas(struct hashfile *f)
continue;
if (check_object_signature(the_repository, &d->oid, data, size,
type_name(type)) < 0)
type) < 0)
die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
/*