summaryrefslogtreecommitdiff
path: root/unpack-file.c
diff options
context:
space:
mode:
Diffstat (limited to 'unpack-file.c')
-rw-r--r--unpack-file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/unpack-file.c b/unpack-file.c
index d24acc2a67..25c56b374a 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");