From: Derrick Stolee <stolee@gmail.com>
Date: Thu, 12 Jul 2018 19:39:37 +0000 (-0400)
Subject: midx: use midx in approximate_object_count
X-Git-Tag: v2.20.0-rc0~249^2~9^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b8990fbfedf7cd9fc92a5208b0fbbd7dad79be6d

midx: use midx in approximate_object_count

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/packfile.c b/packfile.c
index c0eb5ac885..97e7812b6b 100644
--- a/packfile.c
+++ b/packfile.c
@@ -861,10 +861,13 @@ unsigned long approximate_object_count(void)
 {
 	if (!the_repository->objects->approximate_object_count_valid) {
 		unsigned long count;
+		struct multi_pack_index *m;
 		struct packed_git *p;
 
 		prepare_packed_git(the_repository);
 		count = 0;
+		for (m = get_multi_pack_index(the_repository); m; m = m->next)
+			count += m->num_objects;
 		for (p = the_repository->objects->packed_git; p; p = p->next) {
 			if (open_pack_index(p))
 				continue;