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 /revision.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 'revision.c')
| -rw-r--r-- | revision.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/revision.c b/revision.c index 8e93e40bb3..6a6952cd55 100644 --- a/revision.c +++ b/revision.c @@ -54,6 +54,7 @@ static void mark_blob_uninteresting(struct blob *blob) void mark_tree_uninteresting(struct tree *tree) { struct tree_desc desc; + struct name_entry entry; struct object *obj = &tree->object; if (obj->flags & UNINTERESTING) @@ -66,18 +67,11 @@ void mark_tree_uninteresting(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)) - mark_tree_uninteresting(lookup_tree(sha1)); + while (tree_entry(&desc, &entry)) { + if (S_ISDIR(entry.mode)) + mark_tree_uninteresting(lookup_tree(entry.sha1)); else - mark_blob_uninteresting(lookup_blob(sha1)); + mark_blob_uninteresting(lookup_blob(entry.sha1)); } /* |