From: Mike Hommey <mh@glandium.org>
Date: Thu, 16 May 2019 00:37:36 +0000 (+0900)
Subject: Use xmmap_gently instead of xmmap in use_pack
X-Git-Tag: v2.23.0-rc0~130^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3203566a7109e2b83519b379581005cee178c3fd;p=thirdparty%2Fgit.git

Use xmmap_gently instead of xmmap in use_pack

use_pack has its own error message on mmap error, but it can't be
reached when using xmmap, which dies with its own error.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/packfile.c b/packfile.c
index 16bcb75262..6a66b605e9 100644
--- a/packfile.c
+++ b/packfile.c
@@ -630,7 +630,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)