]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fbe8d30 6a0ee54)
Merge branch 'ps/meson-weak-sha1-build' into ps/zlib-ng
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2025 23:18:56 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2025 23:18:56 +0000 (15:18 -0800)
commit64156589d9fc24afbc872a4dffb709926d67262f
tree7a45c983b5aa24912f16e756d0f9efc04d5be8bbtree
parentfbe8d3079d4a96aeb4e4529cc93cc0043b759a05commit | diff
parent6a0ee54f9a3ebf667e86f7110c36b2240df96166commit | diff
Merge branch 'ps/meson-weak-sha1-build' into ps/zlib-ng

* ps/meson-weak-sha1-build:
  meson: provide a summary of configured backends
  meson: wire up unsafe SHA1 backend
  meson: add missing dots for build options
  meson: simplify conditions for HTTPS and SHA1 dependencies
  meson: require SecurityFramework when it's used as SHA1 backend
  meson: deduplicate access to SHA1/SHA256 backend options
  meson: consistenlty spell 'CommonCrypto'
meson_options.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.