Merge branch 'sp/mmap'

* sp/mmap: (27 commits)
Spell default packedgitlimit slightly differently
Increase packedGit{Limit,WindowSize} on 64 bit systems.
Update packedGit config option documentation.
mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
pack-objects: fix use of use_pack().
Fix random segfaults in pack-objects.
Cleanup read_cache_from error handling.
Replace mmap with xmmap, better handling MAP_FAILED.
Release pack windows before reporting out of memory.
Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
Test suite for sliding window mmap implementation.
Create pack_report() as a debugging aid.
Support unmapping windows on 'temporary' packfiles.
Improve error message when packfile mmap fails.
Ensure core.packedGitWindowSize cannot be less than 2 pages.
Load core configuration in git-verify-pack.
Fully activate the sliding window pack access.
Unmap individual windows rather than entire files.
Document why header parsing won't exceed a window.
Loop over pack_windows when inflating/accessing data.
...

Conflicts:

cache.h
pack-check.c

diff --cc Documentation/config.txt
Simple merge

diff --cc cache.h
index 31b0819e83d7f76ed52db7771cf274e74b2156dc,a5fc23235ea57cc562074276845e23608eea4960..36be64e3868456b11bc9a6024be5e955074241b2
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -421,7 -431,7 +432,8 @@@ extern char *git_commit_encoding
  extern char *git_log_output_encoding;
  
  extern int copy_fd(int ifd, int ofd);
+ extern void read_or_die(int fd, void *buf, size_t count);
 +extern int write_in_full(int fd, const void *buf, size_t count, const char *);
  extern void write_or_die(int fd, const void *buf, size_t count);
  extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
  

diff --cc diff.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc write_or_die.c
Simple merge