X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=read-tree.c;h=f6298e5c2178ee8e5f898ea769ae7108d1a7cfbd;hb=902b92e00e491a60d55c4b2bce122903b8347f34;hp=7b50fe6e936ed743b919f014d439654eddef0b8f;hpb=94537c78a82619b2625cb827ec0094703579bfed;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 7b50fe6e9..f6298e5c2 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -11,11 +11,14 @@ static int unpack_tree(unsigned char *sha1)
 {
 	void *buffer;
 	unsigned long size;
+	int ret;
 
-	buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
+	buffer = read_object_with_reference(sha1, "tree", &size, 0);
 	if (!buffer)
 		return -1;
-	return read_tree(buffer, size, stage);
+	ret = read_tree(buffer, size, stage);
+	free(buffer);
+	return ret;
 }
 
 static char *lockfile_name;
@@ -191,7 +194,7 @@ int main(int argc, char **argv)
 			merge = 1;
 			continue;
 		}
-		if (get_sha1_hex(arg, sha1) < 0)
+		if (get_sha1(arg, sha1) < 0)
 			usage(read_tree_usage);
 		if (stage > 3)
 			usage(read_tree_usage);