X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-file.c;h=25c56b374ae01ba890ee243368077c1316d9f0ba;hb=fa2e71c9e794c43634670b62d1b4bf58d1ae7e60;hp=ccddf1d4b0cf7fd3a699d8b33cf5bc4c5c4435b7;hpb=07c747ee18165c4f94cd0d018fa7f46aa64429f6;p=git.git

diff --git a/unpack-file.c b/unpack-file.c
index ccddf1d4b..25c56b374 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -5,19 +5,19 @@ 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");
 	fd = mkstemp(path);
 	if (fd < 0)
 		die("unable to create temp-file");
-	if (write(fd, buf, size) != size)
+	if (write_in_full(fd, buf, size) != size)
 		die("unable to write temp-file");
 	close(fd);
 	return path;