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

gitster · gitster · commit 6f402a93ce1e · 2015-07-27T12:21:42.000-07:00
"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
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -2116,6 +2116,9 @@ int git_config_set_multivar_in_file(const char *config_filename,`
`2116`	`2116`	`contents_sz - copy_begin) <`
`2117`	`2117`	`contents_sz - copy_begin)`
`2118`	`2118`	`goto write_err_out;`
	`2119`	`+`
	`2120`	`+ munmap(contents, contents_sz);`
	`2121`	`+ contents = NULL;`
`2119`	`2122`	`}`
`2120`	`2123`
`2121`	`2124`	`if (commit_lock_file(lock) < 0) {`