summaryrefslogtreecommitdiffstats
path: root/bulk-checkin.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-12-30 15:50:28 +0100
committerJunio C Hamano <gitster@pobox.com>2024-12-30 15:50:28 +0100
commitcade724b527d753def6b2cd169df62ef03bdbfe2 (patch)
treeb202c56abb0a9c3b7d575963fa1d305ed4d91ae6 /bulk-checkin.c
parentMerge branch 'ps/meson-test-wo-gitweb' (diff)
parentci: exercise unsafe OpenSSL backend (diff)
downloadgit-cade724b527d753def6b2cd169df62ef03bdbfe2.tar.xz
git-cade724b527d753def6b2cd169df62ef03bdbfe2.zip
Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build
* 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
Diffstat (limited to 'bulk-checkin.c')
-rw-r--r--bulk-checkin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 4a70a70a95..433070a3bd 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -272,7 +272,7 @@ static int deflate_blob_to_pack(struct bulk_checkin_packfile *state,
OBJ_BLOB, size);
the_hash_algo->init_fn(&ctx);
the_hash_algo->update_fn(&ctx, obuf, header_len);
- the_hash_algo->init_fn(&checkpoint.ctx);
+ the_hash_algo->unsafe_init_fn(&checkpoint.ctx);
/* Note: idx is non-NULL when we are writing */
if ((flags & HASH_WRITE_OBJECT) != 0)