From a09c985eae694db1cf31c72db0e2e1bf42f1274f Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Sun, 28 Jan 2018 01:13:19 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- match-trees.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'match-trees.c') diff --git a/match-trees.c b/match-trees.c index afb771c4f5..0ca99d5162 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; } -- cgit v1.2.3