]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/weak-sha1-for-tail-sum-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Jan 2025 17:21:14 +0000 (09:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Jan 2025 17:21:14 +0000 (09:21 -0800)
An earlier "csum-file checksum does not have to be computed with
sha1dc" topic had a few code paths that had initialized an
implementation of a hash function to be used by an unmatching hash
by mistake, which have been corrected.

* 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