Merge branch 'cb/mkstemps-uint-type-fix' into maint

diff --git a/read-cache.c b/read-cache.c
index 32816763bd6dbe3d5e1784b3a39bb8c431ec82f9..7b1be1b6712cdd09f4c341c9d75cfd0ed6c3aa37 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -2140,7 +2140,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
        if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
                die(_("%s: index file smaller than expected"), path);
 
-       mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
+       mmap = xmmap_gently(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
        if (mmap == MAP_FAILED)
                die_errno(_("%s: unable to map index file"), path);
        close(fd);