Only use a single parser for tree objects

This makes read_tree_recursive and read_tree take a struct tree
instead of a buffer. It also move the declaration of read_tree into
tree.h (where struct tree is defined), and updates ls-tree and
diff-index (the only places that presently use read_tree*()) to use
the new versions.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Daniel Barkalow
2006-01-26 01:13:36 -05:00
committed by Junio C Hamano
parent 731043fd4d
commit 521698b153
5 changed files with 31 additions and 46 deletions

View File

@ -84,8 +84,7 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen,
int main(int argc, const char **argv)
{
unsigned char sha1[20];
char *buf;
unsigned long size;
struct tree *tree;
prefix = setup_git_directory();
if (prefix && *prefix)
@ -131,10 +130,10 @@ int main(int argc, const char **argv)
usage(ls_tree_usage);
pathspec = get_pathspec(prefix, argv + 2);
buf = read_object_with_reference(sha1, "tree", &size, NULL);
if (!buf)
tree = parse_tree_indirect(sha1);
if (!tree)
die("not a tree object");
read_tree_recursive(buf, size, "", 0, 0, pathspec, show_tree);
read_tree_recursive(tree, "", 0, 0, pathspec, show_tree);
return 0;
}