diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-09-12 04:00:34 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-09-12 04:00:34 +0200 |
| commit | 049dbf42f50a7d04db5ab99577455b8933e3d532 (patch) | |
| tree | b03f3dbd84b2dcba20b49d6ac872316455a94aa0 | |
| parent | 6c21211c3842ae4c86d7ad7eba05b3268fa117ac (diff) | |
| parent | 220d6f8a104661ae9edc4f96cd8f520ef4c4dc1d (diff) | |
| download | libgit2-049dbf42f50a7d04db5ab99577455b8933e3d532.tar.gz | |
Merge pull request #3421 from ethomson/mempack-fix
Mempack fix
| -rw-r--r-- | src/odb_mempack.c | 8 | ||||
| -rw-r--r-- | src/oidmap.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/odb_mempack.c b/src/odb_mempack.c index 34355270f..594a2784c 100644 --- a/src/odb_mempack.c +++ b/src/odb_mempack.c @@ -154,12 +154,16 @@ void git_mempack_reset(git_odb_backend *_backend) }); git_array_clear(db->commits); + + git_oidmap_clear(db->objects); } static void impl__free(git_odb_backend *_backend) { - git_mempack_reset(_backend); - git__free(_backend); + struct memory_packer_db *db = (struct memory_packer_db *)_backend; + + git_oidmap_free(db->objects); + git__free(db); } int git_mempack_new(git_odb_backend **out) diff --git a/src/oidmap.h b/src/oidmap.h index d2c451e7f..2cf208f53 100644 --- a/src/oidmap.h +++ b/src/oidmap.h @@ -49,4 +49,6 @@ GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid) #define git_oidmap_size(h) kh_size(h) +#define git_oidmap_clear(h) kh_clear(oid, h) + #endif |