mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use a single parser for tree objects

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
diff-index.c
View File

@ -1,4 +1,5 @@
#include "cache.h"
#include "tree.h"
#include "diff.h"
static int cached_only = 0;
@ -174,8 +175,7 @@ int main(int argc, const char **argv)
unsigned char sha1[20];
const char *prefix = setup_git_directory();
const char **pathspec = NULL;
void *tree;
unsigned long size;
struct tree *tree;
int ret;
int allow_options = 1;
int i;
@ -233,10 +233,10 @@ int main(int argc, const char **argv)
mark_merge_entries();
tree = read_object_with_reference(sha1, "tree", &size, NULL);
tree = parse_tree_indirect(sha1);
if (!tree)
die("bad tree object %s", tree_name);
if (read_tree(tree, size, 1, pathspec))
if (read_tree(tree, 1, pathspec))
die("unable to read tree object %s", tree_name);
ret = diff_cache(active_cache, active_nr, pathspec);