diff options
| author | Patrick Steinhardt <ps@pks.im> | 2026-03-12 09:43:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-12 08:38:43 -0700 |
| commit | 6801ffd37df8420917e1feaf03b5f7c175798bff (patch) | |
| tree | 07c19a65d1974eed84639ed1b5682aae2491f8c3 /object-name.c | |
| parent | b259f2175b0ccd5574fc6b06b8ec5cbeaa860610 (diff) | |
| download | git-6801ffd37df8420917e1feaf03b5f7c175798bff.tar.xz | |
odb: introduce generic object counting
Similar to the preceding commit, introduce counting of objects on the
object database level, replacing the logic that we have in
`repo_approximate_object_count()`.
Note that the function knows to cache the object count. It's unclear
whether this cache is really required as we shouldn't have that many
cases where we count objects repeatedly. But to be on the safe side the
caching mechanism is retained, with the only excepting being that we
also have to use the passed flags as caching key.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object-name.c')
| -rw-r--r-- | object-name.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/object-name.c b/object-name.c index 7b14c3bf9b..e5adec4c9d 100644 --- a/object-name.c +++ b/object-name.c @@ -837,7 +837,11 @@ int repo_find_unique_abbrev_r(struct repository *r, char *hex, const unsigned hexsz = algo->hexsz; if (len < 0) { - unsigned long count = repo_approximate_object_count(r); + unsigned long count; + + if (odb_count_objects(r->objects, ODB_COUNT_OBJECTS_APPROXIMATE, &count) < 0) + count = 0; + /* * Add one because the MSB only tells us the highest bit set, * not including the value of all the _other_ bits (so "15" |