]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/odb-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2026 17:19:17 +0000 (10:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2026 17:19:17 +0000 (10:19 -0700)
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

1  2 
builtin/fsck.c
builtin/index-pack.c
builtin/receive-pack.c
builtin/unpack-objects.c
fetch-pack.c
object-file.c
packfile.c
packfile.h
refs.c

diff --cc builtin/fsck.c
index 99696604b8c32fdd9ba2217d9777eea18fe49f3b,4bd0faeff1f4fce2d9bac195566f487f97808a0f..248f8ff5a03bc96c44b91f247faa2054923489ae
@@@ -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;
                }
Simple merge
Simple merge
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc object-file.c
Simple merge
diff --cc packfile.c
Simple merge
diff --cc packfile.h
Simple merge
diff --cc refs.c
Simple merge