]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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'

1  2 
meson_options.txt patch | diff1 | diff2 | blob | history

diff --cc meson_options.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.