]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/unsafe-hash-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Feb 2025 18:23:32 +0000 (10:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Feb 2025 18:23:32 +0000 (10:23 -0800)
The API around choosing to use unsafe variant of SHA-1
implementation has been updated in an attempt to make it harder to
abuse.

* tb/unsafe-hash-cleanup:
  hash.h: drop unsafe_ function variants
  csum-file: introduce hashfile_checkpoint_init()
  t/helper/test-hash.c: use unsafe_hash_algo()
  csum-file.c: use unsafe_hash_algo()
  hash.h: introduce `unsafe_hash_algo()`
  csum-file.c: extract algop from hashfile_checksum_valid()
  csum-file: store the hash algorithm as a struct field
  t/helper/test-tool: implement sha1-unsafe helper

1  2 
builtin/fast-import.c
bulk-checkin.c
object-file.c
t/helper/test-tool.c
t/helper/test-tool.h

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