git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/unpack-file.c b/unpack-file.c
index d24acc2a67c4b7ba112bd192680b137f30a06003..65c66eb0bf34efee6485db3dbf8af11788c394f4 100644 (file)
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -5,18 +5,16 @@ 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");
+       fd = xmkstemp(path);
        if (write_in_full(fd, buf, size) != size)
                die("unable to write temp-file");
        close(fd);