summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-25 11:02:10 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-25 11:02:11 -0700
commitc5baf18a404a9713e1b75161855cacbfec32fcf2 (patch)
tree4e0abcbb51224f859308e28ffaa61652030c172a /git-difftool--helper.sh
parentc53312583b2d25b6ed5f0aa421993795743d1da6 (diff)
parent9ca0aaf6de357d46916d81ca40c47886092fe610 (diff)
downloadgit-c5baf18a404a9713e1b75161855cacbfec32fcf2.tar.gz
Merge branch 'jk/diagnose-config-mmap-failure' into maint
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
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions