diff --git a/unpack-file.c b/unpack-file.c
index 25c56b374ae01ba890ee243368077c1316d9f0ba..bcdc8bbb3b44a43aa43db6035a31478158e070af 100644 (file)
--- a/unpack-file.c
+++ b/unpack-file.c
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);
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;