Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / split-index.c

diff --git a/split-index.c b/split-index.c
index e6154e4ea9552cfc2b868453f017ba786cd24a2f..c0e8ad670d0a17a28fd049b6814d8e77c7654dc2 100644 (file)
--- a/split-index.c
+++ b/split-index.c
@@ -79,8 +79,10 @@ void move_cache_to_base_index(struct index_state *istate)
        if (si->base &&
                si->base->ce_mem_pool) {
 
-               if (!istate->ce_mem_pool)
-                       mem_pool_init(&istate->ce_mem_pool, 0);
+               if (!istate->ce_mem_pool) {
+                       istate->ce_mem_pool = xmalloc(sizeof(struct mem_pool));
+                       mem_pool_init(istate->ce_mem_pool, 0);
+               }
 
                mem_pool_combine(istate->ce_mem_pool, istate->split_index->base->ce_mem_pool);
        }