test: do not LoadModule log_config_module unconditionally

diff --git a/unpack-file.c b/unpack-file.c
index 25c56b374ae01ba890ee243368077c1316d9f0ba..75cd2f1a6adf3ea773a6acc3f1e7f122e30676e5 100644 (file)
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "blob.h"
+#include "exec_cmd.h"
 
 static char *create_temp_file(unsigned char *sha1)
 {
@@ -14,9 +15,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);
@@ -27,13 +26,15 @@ int main(int argc, char **argv)
 {
        unsigned char sha1[20];
 
+       git_extract_argv0_path(argv[0]);
+
        if (argc != 2)
-               usage("git-unpack-file <sha1>");
+               usage("git unpack-file <sha1>");
        if (get_sha1(argv[1], sha1))
                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;