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

sha1_file: convert write_sha1_file to object_id

Browse Source 
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:
Patryk Obara
2018-01-28 01:13:19 +01:00
committed by Junio C Hamano
parent bbca96d579
commit a09c985eae
18 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cache-tree.c
View File

@ -406,9 +406,10 @@ static int update_one(struct cache_tree *it,
oidcpy(&it->oid, &oid);
else
to_invalidate = 1;
} else if (dryrun)
} else if (dryrun) {
hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid);
else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->oid.hash)) {
} else if (write_object_file(buffer.buf, buffer.len, tree_type,
&it->oid)) {
strbuf_release(&buffer);
return -1;
}