]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/read-object-info-improvements' into ps/odb-for-each-object
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Jan 2026 13:47:47 +0000 (05:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jan 2026 13:47:47 +0000 (05:47 -0800)
* ps/read-object-info-improvements:
  packfile: drop repository parameter from `packed_object_info()`
  packfile: skip unpacking object header for disk size requests
  packfile: disentangle return value of `packed_object_info()`
  packfile: always populate pack-specific info when reading object info
  packfile: extend `is_delta` field to allow for "unknown" state
  packfile: always declare object info to be OI_PACKED
  object-file: always set OI_LOOSE when reading object info

1  2 
builtin/pack-objects.c
commit-graph.c
packfile.c

Simple merge
diff --cc commit-graph.c
Simple merge
diff --cc packfile.c
Simple merge