From: Karsten Blees <karsten.blees@gmail.com>
Date: Tue, 30 Jun 2015 14:34:13 +0000 (+0200)
Subject: config.c: fix writing config files on Windows network shares
X-Git-Tag: v2.5.0-rc2~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a64592cf8cc559d6043500b8e77d1fed07c5ec2;p=thirdparty%2Fgit.git

config.c: fix writing config files on Windows network shares

Renaming to an existing file doesn't work on Windows network shares if the
target file is open.

munmap() the old config file before commit_lock_file.

Signed-off-by: Karsten Blees <blees@dcon.de>
Acked-by: Jeff King <peff@peff.net>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/config.c b/config.c
index 27a73c8500..69824ebddb 100644
--- a/config.c
+++ b/config.c
@@ -2116,6 +2116,9 @@ int git_config_set_multivar_in_file(const char *config_filename,
 					  contents_sz - copy_begin) <
 			    contents_sz - copy_begin)
 				goto write_err_out;
+
+		munmap(contents, contents_sz);
+		contents = NULL;
 	}
 
 	if (commit_lock_file(lock) < 0) {