X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-file.c;h=23a85623019c3b7a465fba86132df3f4b75d94a5;hb=477f2b41310c4b1040a9e7f72720b9c39d82caf9;hp=3accb974dd448233a01e82ab1d6e3599d825fa9e;hpb=65b5e41e24dd76e9cc272399f458857d5b13d63e;p=git.git diff --git a/unpack-file.c b/unpack-file.c index 3accb974d..23a856230 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");