]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/ref-peeled-tags' into kn/maintenance-is-needed
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Nov 2025 15:38:12 +0000 (07:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Nov 2025 15:38:27 +0000 (07:38 -0800)
* ps/ref-peeled-tags: (23 commits)
  t7004: do not chdir around in the main process
  ref-filter: fix stale parsed objects
  ref-filter: parse objects on demand
  ref-filter: detect broken tags when dereferencing them
  refs: don't store peeled object IDs for invalid tags
  object: add flag to `peel_object()` to verify object type
  refs: drop infrastructure to peel via iterators
  refs: drop `current_ref_iter` hack
  builtin/show-ref: convert to use `reference_get_peeled_oid()`
  ref-filter: propagate peeled object ID
  upload-pack: convert to use `reference_get_peeled_oid()`
  refs: expose peeled object ID via the iterator
  refs: refactor reference status flags
  refs: fully reset `struct ref_iterator::ref` on iteration
  refs: introduce `.ref` field for the base iterator
  refs: introduce wrapper struct for `each_ref_fn`
  builtin/repo: add progress meter for structure stats
  builtin/repo: add keyvalue and nul format for structure stats
  builtin/repo: add object counts in structure output
  builtin/repo: introduce structure subcommand
  ...

1  2 
builtin/bisect.c
builtin/fsck.c
builtin/gc.c
builtin/pack-objects.c
builtin/rev-parse.c
http-backend.c
object-name.c
refs/files-backend.c
server-info.c
t/meson.build

Simple merge
diff --cc builtin/fsck.c
Simple merge
diff --cc builtin/gc.c
Simple merge
Simple merge
Simple merge
diff --cc http-backend.c
Simple merge
diff --cc object-name.c
Simple merge
Simple merge
diff --cc server-info.c
Simple merge
diff --cc t/meson.build
Simple merge