X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=unpack-file.c;h=23a85623019c3b7a465fba86132df3f4b75d94a5;hb=fc4c4cd21c783b6dc387002c6e018d26f7405e9f;hp=3accb974dd448233a01e82ab1d6e3599d825fa9e;hpb=ac93bfc3b64a8a3756263ecdadad3e7a117be597;p=git.git diff --git a/unpack-file.c b/unpack-file.c index 3accb974..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");