Merge branch 'ab/object-file-api-updates'
Object-file API shuffling. * ab/object-file-api-updates: object-file API: pass an enum to read_object_with_reference() object-file.c: add a literal version of write_object_file_prepare() object-file API: have hash_object_file() take "enum object_type" object API: rename hash_object_file_literally() to write_*() object-file API: split up and simplify check_object_signature() object API users + docs: check <0, not !0 with check_object_signature() object API docs: move check_object_signature() docs to cache.h object API: correct "buf" v.s. "map" mismatch in *.c and *.h object-file API: have write_object_file() take "enum object_type" object-file API: add a format_object_header() function object-file API: return "void", not "int" from hash_object_file() object-file.c: split up declaration of unrelated variables
This commit is contained in:
@ -736,7 +736,7 @@ static struct cache_entry *create_alias_ce(struct index_state *istate,
|
||||
void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
|
||||
{
|
||||
struct object_id oid;
|
||||
if (write_object_file("", 0, blob_type, &oid))
|
||||
if (write_object_file("", 0, OBJ_BLOB, &oid))
|
||||
die(_("cannot create an empty blob in the object database"));
|
||||
oidcpy(&ce->oid, &oid);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user