summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-25 20:59:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-25 20:59:22 (GMT)
commite13966d5a1695ba7feedb0badf861a12cc58bc58 (patch)
treeb49b7c74c414ccade0d999ffbdc32d24d703510c /read-cache.c
parentc7cf2de8fcec29e1f834ca75a8468f91a0a37637 (diff)
parent02638d1e1153eb89d51a72de51ad854a88c9a178 (diff)
downloadgit-e13966d5a1695ba7feedb0badf861a12cc58bc58.zip
git-e13966d5a1695ba7feedb0badf861a12cc58bc58.tar.gz
git-e13966d5a1695ba7feedb0badf861a12cc58bc58.tar.bz2
Merge branch 'vn/xmmap-gently'
Clean-up an error codepath. * vn/xmmap-gently: read-cache.c: do not die if mmap fails
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index c701f7f..52ffa8a 100644
--- 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);