]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/object-store-midx-dedup-info' into ps/packfile-store
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2025 16:38:03 +0000 (09:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2025 16:38:03 +0000 (09:38 -0700)
* ps/object-store-midx-dedup-info:
  midx: compute paths via their source
  midx: stop duplicating info redundant with its owning source
  midx: write multi-pack indices via their source
  midx: load multi-pack indices via their source
  midx: drop redundant `struct repository` parameter
  odb: simplify calling `link_alt_odb_entry()`
  odb: return newly created in-memory sources
  odb: consistently use "dir" to refer to alternate's directory
  odb: allow `odb_find_source()` to fail
  odb: store locality in object database sources

1  2 
builtin/commit-graph.c
builtin/multi-pack-index.c
builtin/pack-objects.c
builtin/repack.c
midx-write.c
odb.c
odb.h

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc midx-write.c
Simple merge
diff --cc odb.c
Simple merge
diff --cc odb.h
Simple merge