Merge branch 'maint-1.6.1' into maint-1.6.2

diff --git a/config.c b/config.c
index 7a83c76f4b0480416b01213c0aca30b1e92556d2..5d9072c1b937783f0c7759157d03d3ffb5897c14 100644 (file)
--- a/config.c
+++ b/config.c
@@ -954,7 +954,7 @@ int git_config_set_multivar(const char* key, const char* value,
        lock = xcalloc(sizeof(struct lock_file), 1);
        fd = hold_lock_file_for_update(lock, config_filename, 0);
        if (fd < 0) {
-               error("could not lock config file %s", config_filename);
+               error("could not lock config file %s: %s", config_filename, strerror(errno));
                free(store.key);
                ret = -1;
                goto out_free;