summaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:43 (GMT)
commit8be8342b4c47df386c6eced39922595d7dfdccc9 (patch)
tree3fed16dd1602125435cf12a4c150698bb13bdf59 /cache-tree.c
parent157ee050615192d579a358723563e7f785d676ff (diff)
parent1752cbbc447c08230c478239e185db9fa2d4a515 (diff)
downloadgit-8be8342b4c47df386c6eced39922595d7dfdccc9.zip
git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.gz
git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.bz2
Merge branch 'po/object-id'
Conversion from uchar[20] to struct object_id continues. * po/object-id: sha1_file: rename hash_sha1_file_literally sha1_file: convert write_loose_object to object_id sha1_file: convert force_object_loose to object_id sha1_file: convert write_sha1_file to object_id notes: convert write_notes_tree to object_id notes: convert combine_notes_* to object_id commit: convert commit_tree* to object_id match-trees: convert splice_tree to object_id cache: clear whole hash buffer with oidclr sha1_file: convert hash_sha1_file to object_id dir: convert struct sha1_stat to use object_id sha1_file: convert pretend_sha1_file to object_id
Diffstat (limited to 'cache-tree.c')
-rw-r--r--cache-tree.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/cache-tree.c b/cache-tree.c
index 3841cef..c52e430 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -399,16 +399,16 @@ 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);
- else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->oid.hash)) {
+ } else if (dryrun) {
+ hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid);
+ } else if (write_object_file(buffer.buf, buffer.len, tree_type,
+ &it->oid)) {
strbuf_release(&buffer);
return -1;
}