From 521698b1538fb3c9bd818ee98f2c17d2c80c9605 Mon Sep 17 00:00:00 2001 From: Daniel Barkalow Date: Thu, 26 Jan 2006 01:13:36 -0500 Subject: 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 Signed-off-by: Junio C Hamano --- ls-tree.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ls-tree.c') diff --git a/ls-tree.c b/ls-tree.c index d585b6fc13..d005643ee0 100644 --- a/ls-tree.c +++ b/ls-tree.c @@ -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; } -- cgit v1.2.3