Teach 'diff' about 'diff' attribute.

diff --git a/unpack-file.c b/unpack-file.c
index ccddf1d4b0cf7fd3a699d8b33cf5bc4c5c4435b7..25c56b374ae01ba890ee243368077c1316d9f0ba 100644 (file)
--- 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;