summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-13 06:08:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-13 06:08:27 (GMT)
commit65d61e5f512f15b8384a2b6bfe818713fe5bebcb (patch)
tree4e608fbf1ad28bd3beb4c47997de851767464dfc
parent115f0fe49951b951495bdcd0420a44fb11c2173a (diff)
parentf022f85f6d50b66ac5f4c49830a040627a0d8194 (diff)
downloadgit-65d61e5f512f15b8384a2b6bfe818713fe5bebcb.zip
git-65d61e5f512f15b8384a2b6bfe818713fe5bebcb.tar.gz
git-65d61e5f512f15b8384a2b6bfe818713fe5bebcb.tar.bz2
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
* 'maint' of git://repo.or.cz/git/fastimport: fast-import: grow tree storage more aggressively
-rw-r--r--fast-import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c
index d9492b9..ac37145 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1062,7 +1062,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;
@@ -1229,7 +1229,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;