diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-25 13:59:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 13:59:22 -0700 |
| commit | e13966d5a1695ba7feedb0badf861a12cc58bc58 (patch) | |
| tree | b49b7c74c414ccade0d999ffbdc32d24d703510c | |
| parent | Merge branch 'ac/log-use-mailmap-by-default-transition' (diff) | |
| parent | read-cache.c: do not die if mmap fails (diff) | |
| download | tgif-e13966d5a1695ba7feedb0badf861a12cc58bc58.tar.xz | |
Merge branch 'vn/xmmap-gently'
Clean-up an error codepath.
* vn/xmmap-gently:
read-cache.c: do not die if mmap fails
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index c701f7f8b8..52ffa8a313 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); |