The approximate_object_count() function maintains a rough count of
objects in a repository to estimate how long object name abbreviates
should be. Object names are scoped to a repository and the
appropriate length may differ by repository, so the object count
should not be global.
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
object-store.h | 10 +++++++++-
packfile.c | 11 +++++------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/object-store.h b/object-store.h
index 14129fbba1..99f77d10cd 100644
--- a/object-store.h
+++ b/object-store.h
@@ -16,13 +16,21 @@ struct object_store {
struct alternate_object_database *alt_odb_list;
struct alternate_object_database **alt_odb_tail;
+ /*
+ * A fast, rough count of the number of objects in the repository.
+ * These two fields are not meant for direct access. Use
+ * approximate_object_count() instead.
+ */
+ unsigned long approximate_object_count;
+ unsigned approximate_object_count_valid : 1;
+
/*
* Whether packed_git has already been populated with this repository's
* packs.
*/
unsigned packed_git_initialized : 1;
};
-#define OBJECT_STORE_INIT { NULL, MRU_INIT, NULL, NULL, 0 }
+#define OBJECT_STORE_INIT { NULL, MRU_INIT, NULL, NULL, 0, 0, 0 }
struct packed_git {
struct packed_git *next;
diff --git a/packfile.c b/packfile.c
index c54fe0ac1c..98267f014f 100644
--- a/packfile.c
+++ b/packfile.c
@@ -786,8 +786,6 @@ static void prepare_packed_git_one(char *objdir, int local)
strbuf_release(&path);
}
-static int approximate_object_count_valid;
-
/*
* Give a fast, rough count of the number of objects in the repository. This
* ignores loose objects completely. If you have a lot of them, then either
@@ -797,8 +795,8 @@ static int approximate_object_count_valid;
*/
unsigned long approximate_object_count(void)
{
- static unsigned long count;
- if (!approximate_object_count_valid) {
+ if (!the_repository->objects.approximate_object_count_valid) {
+ unsigned long count;
struct packed_git *p;
prepare_packed_git();
@@ -808,8 +806,9 @@ unsigned long approximate_object_count(void)
continue;
count += p->num_objects;
}
+ the_repository->objects.approximate_object_count = count;
}
- return count;
+ return the_repository->objects.approximate_object_count;
}
static void *get_next_packed_git(const void *p)
@@ -883,7 +882,7 @@ void prepare_packed_git(void)
void reprepare_packed_git(void)
{
- approximate_object_count_valid = 0;
+ the_repository->objects.approximate_object_count_valid = 0;
the_repository->objects.packed_git_initialized = 0;
prepare_packed_git();
}
--
2.14.1.581.gf28d330327
