Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index 5326d7c97a693e409de2cbb406e08dd9fac77577..16f6a0f98b5df8fbb9bb5263d0d32afca678cbec 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -782,9 +782,7 @@ static void create_temp(mmfile_t *src, char *path)
        int fd;
 
        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, src->ptr, src->size) != src->size)
                die("unable to write temp-file");
        close(fd);