diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-31 14:23:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-31 14:23:58 -0700 |
| commit | 422dfaf079eec92ec75ef8f766d66404433ad0b1 (patch) | |
| tree | 1e3f4b1904b4478b79c638a35e0886fc88c07f44 /builtin-rev-list.c | |
| parent | Merge branch 'master' into next (diff) | |
| parent | tree_entry(): new tree-walking helper function (diff) | |
| download | tgif-422dfaf079eec92ec75ef8f766d66404433ad0b1.tar.xz | |
Merge branch 'lt/tree-2' into next
* lt/tree-2:
tree_entry(): new tree-walking helper function
Diffstat (limited to 'builtin-rev-list.c')
| -rw-r--r-- | builtin-rev-list.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 6e2b898cca..17c04b962d 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -114,6 +114,7 @@ static struct object_list **process_tree(struct tree *tree, { struct object *obj = &tree->object; struct tree_desc desc; + struct name_entry entry; struct name_path me; if (!revs.tree_objects) @@ -132,18 +133,11 @@ static struct object_list **process_tree(struct tree *tree, desc.buf = tree->buffer; desc.size = tree->size; - while (desc.size) { - unsigned mode; - const char *name; - const unsigned char *sha1; - - sha1 = tree_entry_extract(&desc, &name, &mode); - update_tree_entry(&desc); - - if (S_ISDIR(mode)) - p = process_tree(lookup_tree(sha1), p, &me, name); + while (tree_entry(&desc, &entry)) { + if (S_ISDIR(entry.mode)) + p = process_tree(lookup_tree(entry.sha1), p, &me, name); else - p = process_blob(lookup_blob(sha1), p, &me, name); + p = process_blob(lookup_blob(entry.sha1), p, &me, name); } free(tree->buffer); tree->buffer = NULL; |