diff --git a/read-tree.c b/read-tree.c
index 604884a983e087e25afccc1c52beff3883036e58..f6298e5c2178ee8e5f898ea769ae7108d1a7cfbd 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
{
void *buffer;
unsigned long size;
{
void *buffer;
unsigned long size;
+ int ret;
buffer = read_object_with_reference(sha1, "tree", &size, 0);
if (!buffer)
return -1;
buffer = read_object_with_reference(sha1, "tree", &size, 0);
if (!buffer)
return -1;
- return read_tree(buffer, size, stage);
+ ret = read_tree(buffer, size, stage);
+ free(buffer);
+ return ret;
}
static char *lockfile_name;
}
static char *lockfile_name;
merge = 1;
continue;
}
merge = 1;
continue;
}
- if (get_sha1_hex(arg, sha1) < 0)
+ if (get_sha1(arg, sha1) < 0)
usage(read_tree_usage);
if (stage > 3)
usage(read_tree_usage);
usage(read_tree_usage);
if (stage > 3)
usage(read_tree_usage);