From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Oct 2025 21:12:18 +0000 (-0700)
Subject: Merge branch 'tb/cat-file-objectmode-update'
X-Git-Tag: v2.52.0-rc0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8329f6724b959cec1e78f1dc42add0c05d0151d1;p=thirdparty%2Fgit.git

Merge branch 'tb/cat-file-objectmode-update'

Code clean-up.

* tb/cat-file-objectmode-update:
  builtin/cat-file.c: simplify calling `report_object_status()`
---

8329f6724b959cec1e78f1dc42add0c05d0151d1
diff --cc builtin/cat-file.c
index ee6715fa52,71b94c8b3f..5ca2ca3852
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@@ -487,15 -489,15 +487,15 @@@ static void batch_object_write(const ch
  			data->info.sizep = &data->size;
  
  		if (pack)
 -			ret = packed_object_info(the_repository, pack, offset,
 -						 &data->info);
 +			ret = packed_object_info(the_repository, pack,
 +						 offset, &data->info);
  		else
 -			ret = oid_object_info_extended(the_repository,
 -						       &data->oid, &data->info,
 -						       OBJECT_INFO_LOOKUP_REPLACE);
 +			ret = odb_read_object_info_extended(the_repository->objects,
 +							    &data->oid, &data->info,
 +							    OBJECT_INFO_LOOKUP_REPLACE);
  		if (ret < 0) {
  			if (data->mode == S_IFGITLINK)
- 				report_object_status(opt, oid_to_hex(&data->oid), &data->oid, "submodule");
+ 				report_object_status(opt, NULL, &data->oid, "submodule");
  			else
  				report_object_status(opt, obj_name, &data->oid, "missing");
  			return;