]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanup
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 21:28:17 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 21:28:17 +0000 (14:28 -0700)
* ps/object-wo-the-repository:
  hash: stop depending on `the_repository` in `null_oid()`
  hash: fix "-Wsign-compare" warnings
  object-file: split out logic regarding hash algorithms
  delta-islands: stop depending on `the_repository`
  object-file-convert: stop depending on `the_repository`
  pack-bitmap-write: stop depending on `the_repository`
  pack-revindex: stop depending on `the_repository`
  pack-check: stop depending on `the_repository`
  environment: move access to "core.bigFileThreshold" into repo settings
  pack-write: stop depending on `the_repository` and `the_hash_algo`
  object: stop depending on `the_repository`
  csum-file: stop depending on `the_repository`

20 files changed:
1  2 
Makefile
builtin/clone.c
builtin/fast-export.c
builtin/fast-import.c
builtin/fsck.c
builtin/index-pack.c
builtin/ls-files.c
builtin/name-rev.c
builtin/pack-objects.c
builtin/unpack-objects.c
builtin/update-ref.c
config.c
diff.c
diff.h
hash.h
merge-ort.c
meson.build
refs.c
refs/debug.c
refs/files-backend.c

diff --cc Makefile
Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/fsck.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc config.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
diff --cc hash.h
Simple merge
diff --cc merge-ort.c
Simple merge
diff --cc meson.build
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs/debug.c
Simple merge
Simple merge