X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-rev-list.c;h=e885624255ac8e1007df797d339e3e81020f95a2;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=6e2b898cca7213d4c49e38bb431ac85ddea0e062;hpb=0a2586c807fadc4b13a741e693471765870f6bb4;p=git.git diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 6e2b898c..e8856242 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, entry.path); else - p = process_blob(lookup_blob(sha1), p, &me, name); + p = process_blob(lookup_blob(entry.sha1), p, &me, entry.path); } free(tree->buffer); tree->buffer = NULL;