X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-file.c;h=25c56b374ae01ba890ee243368077c1316d9f0ba;hb=95655d79ad13697e0d68e986d3b0b402efad007a;hp=d24acc2a67c4b7ba112bd192680b137f30a06003;hpb=e861ce1692fa9809f3e7b898804f8ddaf7cd8975;p=git.git

diff --git a/unpack-file.c b/unpack-file.c
index d24acc2a6..25c56b374 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -5,12 +5,12 @@ static char *create_temp_file(unsigned char *sha1)
 {
 	static char path[50];
 	void *buf;
-	char type[100];
+	enum object_type type;
 	unsigned long size;
 	int fd;
 
-	buf = read_sha1_file(sha1, type, &size);
-	if (!buf || strcmp(type, blob_type))
+	buf = read_sha1_file(sha1, &type, &size);
+	if (!buf || type != OBJ_BLOB)
 		die("unable to read blob object %s", sha1_to_hex(sha1));
 
 	strcpy(path, ".merge_file_XXXXXX");