]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/diagnose-config-mmap-failure' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:10 +0000 (11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:11 +0000 (11:02 -0700)
The configuration reader/writer uses mmap(2) interface to access
the files; when we find a directory, it barfed with "Out of memory?".

* jk/diagnose-config-mmap-failure:
  xmmap(): drop "Out of memory?"
  config.c: rewrite ENODEV into EISDIR when mmap fails
  config.c: avoid xmmap error messages
  config.c: fix mmap leak when writing config
  read-cache.c: drop PROT_WRITE from mmap of index

1  2 
config.c
git-compat-util.h
read-cache.c
sha1_file.c

diff --cc config.c
Simple merge
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc sha1_file.c
Simple merge