From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jul 2025 16:14:26 +0000 (-0700)
Subject: Merge branch 'tb/midx-avoid-cruft-packs'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=205493d56d98dd340b4ac5944d11878762f15df1;p=thirdparty%2Fgit.git

Merge branch 'tb/midx-avoid-cruft-packs'

"pack-objects" has been taught to avoid pointing into objects in
cruft packs from midx.

* tb/midx-avoid-cruft-packs:
  repack: exclude cruft pack(s) from the MIDX where possible
  pack-objects: introduce '--stdin-packs=follow'
  pack-objects: swap 'show_{object,commit}_pack_hint'
  pack-objects: fix typo in 'show_object_pack_hint()'
  pack-objects: perform name-hash traversal for unpacked objects
  pack-objects: declare 'rev_info' for '--stdin-packs' earlier
  pack-objects: factor out handling '--stdin-packs'
  pack-objects: limit scope in 'add_object_entry_from_pack()'
  pack-objects: use standard option incompatibility functions
---

205493d56d98dd340b4ac5944d11878762f15df1
diff --cc builtin/pack-objects.c
index 5781dec980,4ae52c6a29..067b9e322a
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@@ -4294,9 -4325,10 +4327,10 @@@ static void add_objects_in_unpacked_pac
  }
  
  static int add_loose_object(const struct object_id *oid, const char *path,
- 			    void *data UNUSED)
+ 			    void *data)
  {
+ 	struct rev_info *revs = data;
 -	enum object_type type = oid_object_info(the_repository, oid, NULL);
 +	enum object_type type = odb_read_object_info(the_repository->objects, oid, NULL);
  
  	if (type < 0) {
  		warning(_("loose object at %s could not be examined"), path);