X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-file.c;h=25c56b374ae01ba890ee243368077c1316d9f0ba;hb=ff1f99453f1fe2fd9470f6ea268aed5a1839bd09;hp=d24acc2a67c4b7ba112bd192680b137f30a06003;hpb=460ca302fdf453459850676c049ed7b46b43a0d4;p=git.git diff --git a/unpack-file.c b/unpack-file.c index d24acc2a6..25c56b374 100644 --- a/unpack-file.c +++ b/unpack-file.c @@ -5,12 +5,12 @@ static char *create_temp_file(unsigned char *sha1) { static char path[50]; void *buf; - char type[100]; + enum object_type type; unsigned long size; int fd; - buf = read_sha1_file(sha1, type, &size); - if (!buf || strcmp(type, blob_type)) + buf = read_sha1_file(sha1, &type, &size); + if (!buf || type != OBJ_BLOB) die("unable to read blob object %s", sha1_to_hex(sha1)); strcpy(path, ".merge_file_XXXXXX");