]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Dec 2024 14:50:28 +0000 (06:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Dec 2024 14:50:28 +0000 (06:50 -0800)
* ps/weak-sha1-for-tail-sum-fix:
  ci: exercise unsafe OpenSSL backend
  builtin/fast-import: fix segfault with unsafe SHA1 backend
  bulk-checkin: fix segfault with unsafe SHA1 backend

1  2 
builtin/fast-import.c
bulk-checkin.c
ci/run-build-and-tests.sh

Simple merge
diff --cc bulk-checkin.c
Simple merge
Simple merge