Browse Source

Merge branch 'lt/tree-2' into next

* lt/tree-2:
  fetch.c: do not call process_tree() from process_tree().
maint
Junio C Hamano 19 years ago
parent
commit
0fa5cb0d1e
  1. 13
      fetch.c

13
fetch.c

@ -47,13 +47,20 @@ static int process_tree(struct tree *tree) @@ -47,13 +47,20 @@ static int process_tree(struct tree *tree)
desc.buf = tree->buffer;
desc.size = tree->size;
while (tree_entry(&desc, &entry)) {
struct object *obj = NULL;

if (S_ISDIR(entry.mode)) {
struct tree *tree = lookup_tree(entry.sha1);
process_tree(tree);
} else {
if (tree)
obj = &tree->object;
}
else {
struct blob *blob = lookup_blob(entry.sha1);
process(&blob->object);
if (blob)
obj = &blob->object;
}
if (!obj || process(obj))
return -1;
}
free(tree->buffer);
tree->buffer = NULL;

Loading…
Cancel
Save