From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Mar 2026 19:58:04 +0000 (-0700)
Subject: Merge branch 'ps/object-counting'
X-Git-Tag: v2.54.0-rc0~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e2964dc89986077af7f8d34b05807d5cbb1cca0;p=thirdparty%2Fgit.git

Merge branch 'ps/object-counting'

The logic to count objects has been cleaned up.

* ps/object-counting:
  odb: introduce generic object counting
  odb/source: introduce generic object counting
  object-file: generalize counting objects
  object-file: extract logic to approximate object count
  packfile: extract logic to count number of objects
  odb: stop including "odb/source.h"
---

8e2964dc89986077af7f8d34b05807d5cbb1cca0
diff --cc repository.c
index 0b8f7ec200,05c26bdbc3..9e5537f539
--- a/repository.c
+++ b/repository.c
@@@ -1,10 -1,9 +1,11 @@@
  #include "git-compat-util.h"
  #include "abspath.h"
  #include "repository.h"
 +#include "hook.h"
  #include "odb.h"
+ #include "odb/source.h"
  #include "config.h"
 +#include "gettext.h"
  #include "object.h"
  #include "lockfile.h"
  #include "path.h"