Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-13 16:37:19 +0300
committerJunio C Hamano <gitster@pobox.com>2018-11-13 16:37:19 +0300
commit5fb9263295b425c7acfde66c8abe5d53fa55d2c3 (patch)
tree8e62ddfccfdc49a24407fcf1eafc67e5548fdfd8 /packfile.c
parent25e4da89edc5339019f0d7c29a21ef4e08cccf24 (diff)
parentdc7d66433536b5acca653c3c5ecf9c2d91462eba (diff)
Merge branch 'ds/test-multi-pack-index'
Tests for the recently introduced multi-pack index machinery. * ds/test-multi-pack-index: packfile: close multi-pack-index in close_all_packs multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX midx: close multi-pack-index on repack midx: fix broken free() in close_midx()
Diffstat (limited to 'packfile.c')
-rw-r--r--packfile.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/packfile.c b/packfile.c
index f2850a00b5..d1e6683ffe 100644
--- a/packfile.c
+++ b/packfile.c
@@ -345,6 +345,11 @@ void close_all_packs(struct raw_object_store *o)
BUG("want to close pack marked 'do-not-close'");
else
close_pack(p);
+
+ if (o->multi_pack_index) {
+ close_midx(o->multi_pack_index);
+ o->multi_pack_index = NULL;
+ }
}
/*