]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/cat-file-objectmode-update'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Oct 2025 21:12:18 +0000 (14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Oct 2025 21:12:18 +0000 (14:12 -0700)
Code clean-up.

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

1  2 
builtin/cat-file.c

index ee6715fa523ce6094dd65a83b2f8b413f3854a87,71b94c8b3fb34fb71b73d1a104acd9d7518c2b5e..5ca2ca38525b846887a7dcb39669366ae4df2deb
@@@ -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;