Convert "mark_tree_uninteresting()" to raw tree walker
Not very many users to go.. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds committed
May 29, 2006 at 12:20 UTC
f75e53edb38c97c8b21b69d4fc00d5419199ae4b
1 file changed
+22
-9
revision.c
+22
-9
@@ -53,8 +53,8 @@ static void mark_blob_uninteresting(struct blob *blob)
53
54
void mark_tree_uninteresting(struct tree *tree)
55
{
56
+ struct tree_desc desc;
57
struct object *obj = &tree->object;
57
- struct tree_entry_list *entry;
58
59
if (obj->flags & UNINTERESTING)
60
return;
@@ -63,16 +63,29 @@ void mark_tree_uninteresting(struct tree *tree)
63
return;
64
if (parse_tree(tree) < 0)
65
die("bad tree %s", sha1_to_hex(obj->sha1));
66
- entry = create_tree_entry_list(tree);
67
- while (entry) {
68
- struct tree_entry_list *next = entry->next;
69
- if (entry->directory)
70
- mark_tree_uninteresting(lookup_tree(entry->sha1));
66
+
67
+ desc.buf = tree->buffer;
68
+ desc.size = tree->size;
69
+ while (desc.size) {
70
+ unsigned mode;
71
+ const char *name;
72
+ const unsigned char *sha1;
73
+
74
+ sha1 = tree_entry_extract(&desc, &name, &mode);
75
+ update_tree_entry(&desc);
76
+
77
+ if (S_ISDIR(mode))
78
+ mark_tree_uninteresting(lookup_tree(sha1));
79
else
72
- mark_blob_uninteresting(lookup_blob(entry->sha1));
73
- free(entry);
74
- entry = next;
80
+ mark_blob_uninteresting(lookup_blob(sha1));
81
}
82
+
83
+ /*
84
+ * We don't care about the tree any more
85
+ * after it has been marked uninteresting.
86
+ */
87
+ free(tree->buffer);
88
+ tree->buffer = NULL;
89
}
90
91
void mark_parents_uninteresting(struct commit *commit)