]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ps/zlib-ng'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Feb 2025 22:56:45 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Feb 2025 22:56:45 +0000 (14:56 -0800)
commit9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0
tree54481fadf7f95c85d003db2a4b591ce51cb266d5
parent9fad473faed7862855ced123de81a53fa27187d9
parent78cdeed4c79d165c915e8de0355cc3fb7f5797c5
Merge branch 'ps/zlib-ng'

The code paths to interact with zlib has been cleaned up in
preparation for building with zlib-ng.

* ps/zlib-ng:
  ci: make "linux-musl" job use zlib-ng
  ci: switch linux-musl to use Meson
  compat/zlib: allow use of zlib-ng as backend
  git-zlib: cast away potential constness of `next_in` pointer
  compat/zlib: provide stubs for `deflateSetHeader()`
  compat/zlib: provide `deflateBound()` shim centrally
  git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
  compat: introduce new "zlib.h" header
  git-compat-util: drop `z_const` define
  compat: drop `uncompress2()` compatibility shim
12 files changed:
.github/workflows/main.yml
.gitlab-ci.yml
Makefile
ci/install-dependencies.sh
ci/lib.sh
ci/run-build-and-tests.sh
csum-file.c
git-compat-util.h
meson.build
meson_options.txt
reftable/block.c
reftable/system.h