Merge branch 'nd/completion-no-cache-failure' into maint

diff --git a/fast-import.c b/fast-import.c
index f38d04fa58510bb7ab35caf4c43d5b2d954cc292..606d44278d88b3ae23dac934dc1e77eb0b138c31 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -644,7 +644,7 @@ static struct tree_content *grow_tree_content(
        struct tree_content *r = new_tree_content(t->entry_count + amt);
        r->entry_count = t->entry_count;
        r->delta_depth = t->delta_depth;
-       memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
+       COPY_ARRAY(r->entries, t->entries, t->entry_count);
        release_tree_content(t);
        return r;
 }