sha1_file: convert write_sha1_file to object_id
Convert the definition and declaration of write_sha1_file to struct object_id and adjust usage of this function. This commit also converts static function write_sha1_file_prepare, as it is closely related. Rename these functions to write_object_file and write_object_file_prepare respectively. Replace sha1_to_hex, hashcpy and hashclr with their oid equivalents wherever possible. Signed-off-by: Patryk Obara <patryk.obara@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
bbca96d579
commit
a09c985eae
@ -631,10 +631,10 @@ static struct cache_entry *create_alias_ce(struct index_state *istate,
|
||||
|
||||
void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
|
||||
{
|
||||
unsigned char sha1[20];
|
||||
if (write_sha1_file("", 0, blob_type, sha1))
|
||||
struct object_id oid;
|
||||
if (write_object_file("", 0, blob_type, &oid))
|
||||
die("cannot create an empty blob in the object database");
|
||||
hashcpy(ce->oid.hash, sha1);
|
||||
oidcpy(&ce->oid, &oid);
|
||||
}
|
||||
|
||||
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
|
||||
|
||||
Reference in New Issue
Block a user