X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-file.c;h=bcdc8bbb3b44a43aa43db6035a31478158e070af;hb=52e8370bc7a71366b664ece0a9ec0b79d673a356;hp=25c56b374ae01ba890ee243368077c1316d9f0ba;hpb=e8811929344c46aed7669e148527af054eb3e18b;p=git.git

diff --git a/unpack-file.c b/unpack-file.c
index 25c56b374..bcdc8bbb3 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -14,9 +14,7 @@ static char *create_temp_file(unsigned char *sha1)
 		die("unable to read blob object %s", sha1_to_hex(sha1));
 
 	strcpy(path, ".merge_file_XXXXXX");
-	fd = mkstemp(path);
-	if (fd < 0)
-		die("unable to create temp-file");
+	fd = xmkstemp(path);
 	if (write_in_full(fd, buf, size) != size)
 		die("unable to write temp-file");
 	close(fd);
@@ -33,7 +31,7 @@ int main(int argc, char **argv)
 		die("Not a valid object name %s", argv[1]);
 
 	setup_git_directory();
-	git_config(git_default_config);
+	git_config(git_default_config, NULL);
 
 	puts(create_temp_file(sha1));
 	return 0;