X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-tree.c;h=c5f26d5f801504f24d734d8cd84d931769bf54c5;hb=de809dbbce497e0d107562615c1d85ff35b4e0c5;hp=f8dc509a1f999fcbcccc6936477ddc80c9d063cc;hpb=3c249c950649a37f2871a8b193f01a0640a20aef;p=git.git diff --git a/read-tree.c b/read-tree.c index f8dc509a..c5f26d5f 100644 --- a/read-tree.c +++ b/read-tree.c @@ -11,11 +11,14 @@ static int unpack_tree(unsigned char *sha1) { void *buffer; unsigned long size; + int ret; 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; @@ -156,7 +159,7 @@ static void merge_stat_info(struct cache_entry **src, int nr) } } -static char *read_tree_usage = "read-tree ( | -m [ ])"; +static char *read_tree_usage = "git-read-tree ( | -m [ ])"; int main(int argc, char **argv) {