Merge branch 'jm/mem-pool' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Mar 2018 01:27:26 +0000 (18:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Mar 2018 01:27:26 +0000 (18:27 -0700)
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

1  2 
Makefile
fast-import.c
diff --cc Makefile
index 82b1e644c4c9dfaf6094333ad82b9ff1adff3fa6,1e142b1dd9d4c9ad37124bbe28c40639c21ce5b3..7dcb37c18fc873ca8f4ee081134bd2b666ebd68f
+++ 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
diff --cc fast-import.c
Simple merge