summaryrefslogtreecommitdiff
path: root/match-trees.c
diff options
context:
space:
mode:
authorPatryk Obara <patryk.obara@gmail.com>2018-01-28 00:13:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-30 18:42:36 (GMT)
commita09c985eae694db1cf31c72db0e2e1bf42f1274f (patch)
tree3acdfc26ab59d2ac822e4b4cf6ad93bf746fb65d /match-trees.c
parentbbca96d579b31900c9c0ad39299a3c9a3bd276f9 (diff)
downloadgit-a09c985eae694db1cf31c72db0e2e1bf42f1274f.zip
git-a09c985eae694db1cf31c72db0e2e1bf42f1274f.tar.gz
git-a09c985eae694db1cf31c72db0e2e1bf42f1274f.tar.bz2
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 'match-trees.c')
-rw-r--r--match-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/match-trees.c b/match-trees.c
index afb771c..0ca99d5 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -214,7 +214,7 @@ static int splice_tree(const struct object_id *oid1, const char *prefix,
rewrite_with = oid2;
}
oidcpy(rewrite_here, rewrite_with);
- status = write_sha1_file(buf, sz, tree_type, result->hash);
+ status = write_object_file(buf, sz, tree_type, result);
free(buf);
return status;
}