X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=unpack-file.c;h=23a85623019c3b7a465fba86132df3f4b75d94a5;hb=42b5c78845feb44f1d36eecad4c72336d5c2a9c5;hp=07303f8bb3ef2b93f3e7c9bbe116aef9660584d5;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/unpack-file.c b/unpack-file.c
index 07303f8b..23a85623 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "blob.h"
 
 static char *create_temp_file(unsigned char *sha1)
 {
@@ -9,7 +10,7 @@ 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");
@@ -30,6 +31,7 @@ int main(int argc, char **argv)
 		usage("git-unpack-file <sha1>");
 
 	setup_git_directory();
+	git_config(git_default_config);
 
 	puts(create_temp_file(sha1));
 	return 0;