From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Apr 2026 17:19:17 +0000 (-0700)
Subject: Merge branch 'ps/odb-cleanup'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9797fed6cea706f65de64396222545d545226e15;p=thirdparty%2Fgit.git

Merge branch 'ps/odb-cleanup'

Various code clean-up around odb subsystem.

* ps/odb-cleanup:
  odb: drop unneeded headers and forward decls
  odb: rename `odb_has_object()` flags
  odb: use enum for `odb_write_object` flags
  odb: rename `odb_write_object()` flags
  treewide: use enum for `odb_for_each_object()` flags
  CodingGuidelines: document our style for flags
---

9797fed6cea706f65de64396222545d545226e15
diff --cc builtin/fsck.c
index 99696604b8,4bd0faeff1..248f8ff5a0
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@@ -161,13 -162,13 +161,13 @@@ static int mark_object(struct object *o
  		return 0;
  
  	if (!(obj->flags & HAS_OBJ)) {
 -		if (parent && !odb_has_object(the_repository->objects, &obj->oid,
 +		if (parent && !odb_has_object(options->repo->objects, &obj->oid,
- 					      HAS_OBJECT_RECHECK_PACKED)) {
+ 					      ODB_HAS_OBJECT_RECHECK_PACKED)) {
  			printf_ln(_("broken link from %7s %s\n"
  				    "              to %7s %s"),
 -				  printable_type(&parent->oid, parent->type),
 +				  printable_type(options->repo, &parent->oid, parent->type),
  				  describe_object(&parent->oid),
 -				  printable_type(&obj->oid, obj->type),
 +				  printable_type(options->repo, &obj->oid, obj->type),
  				  describe_object(&obj->oid));
  			errors_found |= ERROR_REACHABLE;
  		}