Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

[git.git] / fast-import.c

diff --git a/fast-import.c b/fast-import.c
index d9492b9884fbf78a5986f7701c79136c6f83798f..ac3714596adc88daa08ec2b0efa2fdf465fb0478 100644 (file)
--- 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;