summaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorPatryk Obara <patryk.obara@gmail.com>2018-01-28 00:13:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-30 18:42:36 (GMT)
commitf070faccc1a446e44463560add8434efa8c6bed1 (patch)
treebedd32ac2a7f86e139b4c0b9114bba7dd7cbaa83 /cache-tree.c
parent4b33e60201c12f3a68441807444e3726853a3960 (diff)
downloadgit-f070faccc1a446e44463560add8434efa8c6bed1.zip
git-f070faccc1a446e44463560add8434efa8c6bed1.tar.gz
git-f070faccc1a446e44463560add8434efa8c6bed1.tar.bz2
sha1_file: convert hash_sha1_file to object_id
Convert the declaration and definition of hash_sha1_file to use struct object_id and adjust all function calls. Rename this function to hash_object_file. 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.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/cache-tree.c b/cache-tree.c
index e03e72c..6574eeb 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -400,15 +400,14 @@ static int update_one(struct cache_tree *it,
}
if (repair) {
- unsigned char sha1[20];
- hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1);
- if (has_sha1_file(sha1))
- hashcpy(it->oid.hash, sha1);
+ struct object_id oid;
+ hash_object_file(buffer.buf, buffer.len, tree_type, &oid);
+ if (has_sha1_file(oid.hash))
+ oidcpy(&it->oid, &oid);
else
to_invalidate = 1;
} else if (dryrun)
- hash_sha1_file(buffer.buf, buffer.len, tree_type,
- it->oid.hash);
+ 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)) {
strbuf_release(&buffer);
return -1;