X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit-tree.c;h=bad72e89e8d83360f75c6f260d2b358fd7f2bf36;hb=093b06889104d218e95251176af5cf4aa5dd5cdd;hp=2d8651894a20e752eb47e6da439ad3cee13c29c4;hpb=12d81ce59846e17676c5534257ca2f1783829d63;p=git.git

diff --git a/commit-tree.c b/commit-tree.c
index 2d865189..bad72e89 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -45,14 +45,13 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
 
 static void check_valid(unsigned char *sha1, const char *expect)
 {
-	void *buf;
 	char type[20];
-	unsigned long size;
 
-	buf = read_sha1_file(sha1, type, &size);
-	if (!buf || strcmp(type, expect))
-		die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
-	free(buf);
+	if (sha1_object_info(sha1, type, NULL))
+		die("%s is not a valid object", sha1_to_hex(sha1));
+	if (expect && strcmp(type, expect))
+		die("%s is not a valid '%s' object", sha1_to_hex(sha1),
+		    expect);
 }
 
 /*
@@ -92,7 +91,7 @@ int main(int argc, char **argv)
 
 	git_config(git_default_config);
 
-	if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
+	if (argc < 2 || get_sha1(argv[1], tree_sha1) < 0)
 		usage(commit_tree_usage);
 
 	check_valid(tree_sha1, tree_type);