undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()

Browse Source 
Use the raw tree walker instead.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2006-05-29 12:18:00 -07:00 committed by Junio C Hamano
parent 0790a42a50
commit 1ccf5a345a
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin-read-tree.c
View File

@ -9,6 +9,7 @@
#include "object.h" #include "object.h"
#include "tree.h" #include "tree.h"
#include "tree-walk.h"
#include "cache-tree.h" #include "cache-tree.h"
#include <sys/time.h> #include <sys/time.h>
#include <signal.h> #include <signal.h>
@ -775,19 +776,28 @@ static int read_cache_unmerged(void)
static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
{ {
struct tree_entry_list *ent; struct tree_desc desc;
int cnt; int cnt;
memcpy(it->sha1, tree->object.sha1, 20); memcpy(it->sha1, tree->object.sha1, 20);
for (cnt = 0, ent = tree->entries; ent; ent = ent->next) { desc.buf = tree->buffer;
if (!ent->directory) desc.size = tree->size;
cnt = 0;
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))
cnt++; cnt++;
else { else {
struct cache_tree_sub *sub; struct cache_tree_sub *sub;
struct tree *subtree = lookup_tree(ent->sha1); struct tree *subtree = lookup_tree(sha1);
if (!subtree->object.parsed) if (!subtree->object.parsed)
parse_tree(subtree); parse_tree(subtree);
sub = cache_tree_sub(it, ent->name); sub = cache_tree_sub(it, name);
sub->cache_tree = cache_tree(); sub->cache_tree = cache_tree();
prime_cache_tree_rec(sub->cache_tree, subtree); prime_cache_tree_rec(sub->cache_tree, subtree);
cnt += sub->cache_tree->entry_count; cnt += sub->cache_tree->entry_count;