summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-16 17:42:47 -0700
committerJunio C Hamano <gitster@pobox.com>2021-07-16 17:42:47 -0700
commita93c6fd677f16285ce1109f9f200b2b235ab981e (patch)
treef41a55ef2d736a19648bed510aa9ff8cdee40aee /config.c
parentfba551379ef89b92b9356caa4096144026250c22 (diff)
parentdc0592941138df684770bfe800ccad6b810214c3 (diff)
downloadgit-a93c6fd677f16285ce1109f9f200b2b235ab981e.tar.gz
Merge branch 'ew/mmap-failures'
Error message update. * ew/mmap-failures: xmmap: inform Linux users of tuning knobs on ENOMEM
Diffstat (limited to 'config.c')
-rw-r--r--config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.c b/config.c
index 3cd10aeb90..55313fcf44 100644
--- a/config.c
+++ b/config.c
@@ -3052,7 +3052,8 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (contents == MAP_FAILED) {
if (errno == ENODEV && S_ISDIR(st.st_mode))
errno = EISDIR;
- error_errno(_("unable to mmap '%s'"), config_filename);
+ error_errno(_("unable to mmap '%s'%s"),
+ config_filename, mmap_os_err());
ret = CONFIG_INVALID_FILE;
contents = NULL;
goto out_free;