From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:29:06 +0000 (+0900)
Subject: Merge branch 'jm/mem-pool'
X-Git-Tag: v2.18.0-rc0~107
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cac7a2ba7be9354cfc02e14b50d35c4e9cf2b4d7

Merge branch 'jm/mem-pool'

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:
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
---

cac7a2ba7be9354cfc02e14b50d35c4e9cf2b4d7
diff --cc fast-import.c
index 99f8f56e8c,ba0cb4bdfb..05d1079d23
--- a/fast-import.c
+++ b/fast-import.c
@@@ -169,7 -168,7 +169,8 @@@ Format of STDIN stream
  #include "dir.h"
  #include "run-command.h"
  #include "packfile.h"
 +#include "object-store.h"
+ #include "mem-pool.h"
  
  #define PACK_ID_BITS 16
  #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)