From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Mar 2018 01:27:26 +0000 (-0700)
Subject: Merge branch 'jm/mem-pool' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bfce05db6e32f98fcf06c43c48e155609f33099f

Merge branch 'jm/mem-pool' into next

An reusable "memory pool" implementation has been extracted from
fast-import.c, which in turn has become the first user of the
mem-pool API.

* jm/mem-pool:
Move reusable parts of memory pool into its own file
fast-import: introduce mem_pool type
fast-import: rename mem_pool type to mp_block
---

bfce05db6e32f98fcf06c43c48e155609f33099f
diff --cc Makefile
index 82b1e644c4,1e142b1dd9..7dcb37c18f
--- a/Makefile
+++ b/Makefile
@@@ -838,9 -830,9 +838,10 @@@ LIB_OBJS += list-objects-filter-options
  LIB_OBJS += ll-merge.o
  LIB_OBJS += lockfile.o
  LIB_OBJS += log-tree.o
 +LIB_OBJS += ls-refs.o
  LIB_OBJS += mailinfo.o
  LIB_OBJS += mailmap.o
+ LIB_OBJS += mem-pool.o
  LIB_OBJS += match-trees.o
  LIB_OBJS += merge.o
  LIB_OBJS += merge-blobs.o