diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-04-22 16:31:22 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-22 15:01:14 -0700 |
| commit | 6a730e10a76d1e03a9554292419201534c1521f1 (patch) | |
| tree | 2e28aaf4bb59d3ff7ebac2714dcb2ea40d8843d5 | |
| parent | Prepare for 2.8.2 (diff) | |
| download | tgif-6a730e10a76d1e03a9554292419201534c1521f1.tar.xz | |
win32mmap: set errno appropriately
It is not really helpful when a `git fetch` fails with the message:
fatal: mmap failed: No error
In the particular instance encountered by a colleague of yours truly,
the Win32 error code was ERROR_COMMITMENT_LIMIT which means that the
page file is not big enough.
Let's make the message
fatal: mmap failed: File too large
instead, which is only marginally better, but which can be associated
with the appropriate work-around: setting `core.packedGitWindowSize` to
a relatively small value.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/win32mmap.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/compat/win32mmap.c b/compat/win32mmap.c index 80a8c9af4f..3a39f0fadc 100644 --- a/compat/win32mmap.c +++ b/compat/win32mmap.c @@ -24,15 +24,21 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of hmap = CreateFileMapping((HANDLE)_get_osfhandle(fd), NULL, PAGE_WRITECOPY, 0, 0, NULL); - if (!hmap) + if (!hmap) { + errno = EINVAL; return MAP_FAILED; + } temp = MapViewOfFileEx(hmap, FILE_MAP_COPY, h, l, length, start); if (!CloseHandle(hmap)) warning("unable to close file mapping handle"); - return temp ? temp : MAP_FAILED; + if (temp) + return temp; + + errno = GetLastError() == ERROR_COMMITMENT_LIMIT ? EFBIG : EINVAL; + return MAP_FAILED; } int git_munmap(void *start, size_t length) |