summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-03-12 19:04:46 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-03-12 19:04:46 (GMT)
commit7f09ac4714214d1dc12877cc98fb69cdee22e33e (patch)
tree9eb172df47ce6512270ad223f09700a3dbf930a8 /fast-import.c
parente7411303861f02a28b76a4c43451c427a3439a5c (diff)
parentf022f85f6d50b66ac5f4c49830a040627a0d8194 (diff)
downloadgit-7f09ac4714214d1dc12877cc98fb69cdee22e33e.zip
git-7f09ac4714214d1dc12877cc98fb69cdee22e33e.tar.gz
git-7f09ac4714214d1dc12877cc98fb69cdee22e33e.tar.bz2
Merge branch 'maint'
* maint: fast-import: grow tree storage more aggressively
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c
index 726f5ba..240ef26 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1058,7 +1058,7 @@ static void load_tree(struct tree_entry *root)
struct tree_entry *e = new_tree_entry();
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;
e->tree = NULL;
@@ -1225,7 +1225,7 @@ static int tree_content_set(
}
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->name = to_atom(p, (unsigned short)n);
e->versions[0].mode = 0;