diff --git a/unpack-file.c b/unpack-file.c
index d4ac3a5460568408f96fc26e5228c639dfc20439..23a85623019c3b7a465fba86132df3f4b75d94a5 100644 (file)
--- a/unpack-file.c
+++ b/unpack-file.c
#include "cache.h"
+#include "blob.h"
static char *create_temp_file(unsigned char *sha1)
{
int fd;
buf = read_sha1_file(sha1, type, &size);
- if (!buf || strcmp(type, "blob"))
+ if (!buf || strcmp(type, blob_type))
die("unable to read blob object %s", sha1_to_hex(sha1));
strcpy(path, ".merge_file_XXXXXX");
if (argc != 2 || get_sha1(argv[1], sha1))
usage("git-unpack-file <sha1>");
+ setup_git_directory();
+ git_config(git_default_config);
+
puts(create_temp_file(sha1));
return 0;
}