X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rm.c;h=22c9bd1c6cf2d372e0262506cc1e21daebdf579a;hb=a70c232e0fcb1a72cec024def0f8b1377f15daf4;hp=a3d25e6a571584c486d252c5a8e2b182f3da86e3;hpb=f85fd3f0d1213a2b714fddc7a834817aceeca932;p=git.git

diff --git a/builtin-rm.c b/builtin-rm.c
index a3d25e6a5..22c9bd1c6 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -144,7 +144,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	const char **pathspec;
 	char *seen;
 
-	git_config(git_default_config);
+	git_config(git_default_config, NULL);
 
 	newfd = hold_locked_index(&lock_file, 1);
 
@@ -250,7 +250,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
 	if (active_cache_changed) {
 		if (write_cache(newfd, active_cache, active_nr) ||
-		    close(newfd) || commit_locked_index(&lock_file))
+		    commit_locked_index(&lock_file))
 			die("Unable to write new index file");
 	}