kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  fast-import: grow tree storage more aggressively
maint
Shawn O. Pearce 2007-03-12 15:04:46 -04:00
parent e741130386 f022f85f6d
commit 7f09ac4714
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fast-import.c
View File

@ -1058,7 +1058,7 @@ static void load_tree(struct tree_entry *root)
struct tree_entry *e = new_tree_entry(); struct tree_entry *e = new_tree_entry();


if (t->entry_count == t->entry_capacity) if (t->entry_count == t->entry_capacity)
root->tree = t = grow_tree_content(t, 8); root->tree = t = grow_tree_content(t, t->entry_count);
t->entries[t->entry_count++] = e; t->entries[t->entry_count++] = e;


e->tree = NULL; e->tree = NULL;
@ -1225,7 +1225,7 @@ static int tree_content_set(
} }


if (t->entry_count == t->entry_capacity) if (t->entry_count == t->entry_capacity)
root->tree = t = grow_tree_content(t, 8); root->tree = t = grow_tree_content(t, t->entry_count);
e = new_tree_entry(); e = new_tree_entry();
e->name = to_atom(p, (unsigned short)n); e->name = to_atom(p, (unsigned short)n);
e->versions[0].mode = 0; e->versions[0].mode = 0;