object-file API: have write_object_file() take "enum object_type"
Change the write_object_file() function to take an "enum object_type"
instead of a "const char *type". Its callers either passed
{commit,tree,blob,tag}_type and can pass the corresponding OBJ_* type
instead, or were hardcoding strings like "blob".
This avoids the back & forth fragility where the callers of
write_object_file() would have the enum type, and convert it
themselves via type_name(). We do have to now do that conversion
ourselves before calling write_object_file_prepare(), but those
codepaths will be similarly adjusted in subsequent commits.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
b04cdea46c
commit
c80d226a04
@ -1373,7 +1373,7 @@ static int merge_mode_and_contents(struct merge_options *opt,
|
||||
|
||||
if (!ret &&
|
||||
write_object_file(result_buf.ptr, result_buf.size,
|
||||
blob_type, &result->blob.oid))
|
||||
OBJ_BLOB, &result->blob.oid))
|
||||
ret = err(opt, _("Unable to add %s to database"),
|
||||
a->path);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user