Merge branch 'kb/config-unmap-before-renaming'

"git config" failed to update the configuration file when the underlying filesystem is incapable of renaming a file that is still open. * kb/config-unmap-before-renaming: config.c: fix writing config files on Windows network shares
2015-07-13 14:00:27 -07:00 · 2015-07-13 14:00:27 -07:00 · 313f52334b
commit 313f52334b
parent d790ba92cc 7a64592cf8
1 changed files with 3 additions and 0 deletions
--- a/config.c
+++ b/config.c
@ -2118,6 +2118,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) {