From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Mar 2026 20:16:09 +0000 (-0700)
Subject: Merge branch 'ps/object-counting' into ps/odb-generic-object-name-handling
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=7f757675549755627d0c778296f0b13f331795be;p=rit

Merge branch 'ps/object-counting' into ps/odb-generic-object-name-handling

* ps/object-counting:
  object-file: fix sparse 'plain integer as NULL pointer' error
  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"
---

7f757675549755627d0c778296f0b13f331795be
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"