diff options
| author | Patryk Obara <patryk.obara@gmail.com> | 2018-01-28 01:13:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-30 10:42:36 -0800 |
| commit | a09c985eae694db1cf31c72db0e2e1bf42f1274f (patch) | |
| tree | 3acdfc26ab59d2ac822e4b4cf6ad93bf746fb65d /cache-tree.c | |
| parent | bbca96d579b31900c9c0ad39299a3c9a3bd276f9 (diff) | |
| download | git-a09c985eae694db1cf31c72db0e2e1bf42f1274f.tar.gz | |
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>
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cache-tree.c b/cache-tree.c index 6574eeb80d..597114f604 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -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; } |