Hi,
"object-file.c" is quite a grab-bag of all kinds of different functions.
Many of these functions aren't really a good fit though and should be
owned by a different subsystem. This patch series tries to split up
concerns a bit better by splitting out this functionality into other
files:
- `safe_create_leading_directories()` is moved into "dir.c".
- `xmmap()` is moved into "wrapper.c".
- `git_open_cloexec()` is moved into "compat/open.c".
- Several functions attached to `struct index_state` are moved into
"read-cache.c".
- Several functions related to `struct object_store` are moved into a
new file "object-store.c".
"object-file.c" now mostly contains logic to read and write loose object
files, whereas "object-store.c" contains the higher-level logic to
manage different object directories for a repository. Eventually, these
will become the loose object backend as well as the `struct ref_store`
equivalent for objects, respectively.
The series is built on top of 9d22ac51228 (The third batch, 2025-04-07)
with ps/object-wo-the-repository at 9442b1c919a (Merge remote-tracking
branch 'junio/ps/object-wo-the-repository' into HEAD, 2025-04-08) merged
into it.
Thanks!
Patrick
---
Patrick Steinhardt (9):
object-file: move `safe_create_leading_directories()` into "dir.c"
object-file: move `git_open_cloexec()` to "compat/open.c"
object-file: move `xmmap()` into "wrapper.c"
object-file: split out functions relating to object store subsystem
object-file: split up concerns of `HASH_*` flags
object-file: split out functions relating to index subsystem
object: split out functions relating to object store subsystem
object-store: remove global array of cached objects
object-store: merge "object-store-ll.h" and "object-store.h"
Makefile | 3 +-
apply.c | 2 +-
archive-tar.c | 2 +-
archive-zip.c | 2 +-
archive.c | 2 +-
attr.c | 2 +-
bisect.c | 2 +-
blame.c | 4 +-
builtin/backfill.c | 2 +-
builtin/blame.c | 2 +-
builtin/bugreport.c | 2 +-
builtin/cat-file.c | 2 +-
builtin/checkout.c | 3 +-
builtin/clone.c | 2 +-
builtin/commit-graph.c | 2 +-
builtin/commit-tree.c | 2 +-
builtin/count-objects.c | 2 +-
builtin/credential-cache--daemon.c | 2 +-
builtin/describe.c | 2 +-
builtin/diagnose.c | 2 +-
builtin/difftool.c | 4 +-
builtin/fast-export.c | 2 +-
builtin/fast-import.c | 2 +-
builtin/fetch.c | 2 +-
builtin/fsck.c | 3 +-
builtin/gc.c | 4 +-
builtin/grep.c | 2 +-
builtin/hash-object.c | 26 +-
builtin/index-pack.c | 2 +-
builtin/init-db.c | 2 +-
builtin/log.c | 4 +-
builtin/ls-tree.c | 2 +-
builtin/merge-file.c | 1 +
builtin/merge-tree.c | 2 +-
builtin/mktag.c | 2 +-
builtin/mktree.c | 3 +-
builtin/multi-pack-index.c | 2 +-
builtin/notes.c | 3 +-
builtin/pack-objects.c | 2 +-
builtin/pack-redundant.c | 2 +-
builtin/prune.c | 2 +-
builtin/receive-pack.c | 3 +-
builtin/remote.c | 2 +-
builtin/repack.c | 2 +-
builtin/replace.c | 5 +-
builtin/rev-list.c | 2 +-
builtin/show-ref.c | 2 +-
builtin/submodule--helper.c | 2 +-
builtin/tag.c | 3 +-
builtin/unpack-file.c | 3 +-
builtin/unpack-objects.c | 3 +-
builtin/update-index.c | 2 +-
bulk-checkin.c | 9 +-
bundle-uri.c | 2 +-
bundle.c | 2 +-
cache-tree.c | 4 +-
combine-diff.c | 2 +-
commit-graph.c | 4 +-
commit-graph.h | 2 +-
commit.c | 3 +-
compat/open.c | 29 +
config.c | 2 +-
connected.c | 2 +-
convert.c | 2 +-
diagnose.c | 2 +-
diff.c | 4 +-
diffcore-rename.c | 2 +-
dir.c | 109 ++-
dir.h | 35 +
entry.c | 2 +-
fetch-pack.c | 2 +-
fmt-merge-msg.c | 2 +-
fsck.c | 2 +-
git-compat-util.h | 3 +
grep.c | 2 +-
http-backend.c | 2 +-
http-push.c | 3 +-
http-walker.c | 2 +-
http.c | 2 +-
list-objects-filter.c | 2 +-
list-objects.c | 2 +-
log-tree.c | 2 +-
mailmap.c | 2 +-
match-trees.c | 3 +-
merge-blobs.c | 2 +-
merge-ort.c | 3 +-
merge-recursive.c | 2 +-
meson.build | 2 +
midx-write.c | 1 +
midx.c | 1 -
notes-cache.c | 3 +-
notes-merge.c | 5 +-
notes.c | 3 +-
object-file.c | 1420 +-----------------------------------
object-file.h | 118 +--
object-name.c | 2 +-
object-store-ll.h | 556 --------------
object-store.c | 1050 ++++++++++++++++++++++++++
object-store.h | 516 ++++++++++++-
object.c | 67 --
oss-fuzz/fuzz-pack-idx.c | 2 +-
pack-bitmap-write.c | 2 +-
pack-bitmap.c | 3 +-
pack-check.c | 2 +-
pack-mtimes.c | 3 +-
pack-objects.h | 2 +-
pack-revindex.c | 3 +-
packfile.c | 2 +-
path.c | 2 +-
promisor-remote.c | 2 +-
protocol-caps.c | 2 +-
prune-packed.c | 2 +-
reachable.c | 2 +-
read-cache.c | 230 +++++-
read-cache.h | 9 +
ref-filter.c | 2 +-
reflog.c | 2 +-
refs.c | 2 +-
remote.c | 2 +-
replace-object.c | 2 +-
replace-object.h | 2 +-
repository.c | 2 +-
rerere.c | 2 +-
revision.c | 2 +-
send-pack.c | 2 +-
sequencer.c | 2 +-
server-info.c | 2 +-
shallow.c | 2 +-
streaming.c | 2 +-
submodule-config.c | 2 +-
submodule.c | 2 +-
t/helper/test-pack-mtimes.c | 2 +-
t/helper/test-partial-clone.c | 2 +-
t/helper/test-read-graph.c | 2 +-
t/helper/test-read-midx.c | 2 +-
t/helper/test-ref-store.c | 2 +-
tag.c | 2 +-
tmp-objdir.c | 2 +-
tree-walk.c | 2 +-
tree.c | 2 +-
unpack-trees.c | 2 +-
upload-pack.c | 2 +-
walker.c | 2 +-
wrapper.c | 48 ++
xdiff-interface.c | 2 +-
145 files changed, 2296 insertions(+), 2224 deletions(-)
---
base-commit: 9442b1c919af9aed513eb0a484fe96358a500cf5
change-id: 20250408-pks-split-object-file-c61d7cd2a21f
