Merge branch 'es/local-atomic-push-failure-with-http' into maint

diff --git a/packfile.c b/packfile.c
index 2ff570fbfdb2fc0e7f2cbc7bb8d1f25cb7b402bd..d55cb7f013f2c28cea7245c09eb0c334ef10511a 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -640,7 +640,7 @@ unsigned char *use_pack(struct packed_git *p,
                        while (packed_git_limit < pack_mapped
                                && unuse_one_window(p))
                                ; /* nothing */
-                       win->base = xmmap(NULL, win->len,
+                       win->base = xmmap_gently(NULL, win->len,
                                PROT_READ, MAP_PRIVATE,
                                p->pack_fd, win->offset);
                        if (win->base == MAP_FAILED)