diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-31 10:05:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-31 10:05:46 -0800 |
| commit | 0cbcba54550b1ea108e977c24b835e07b96b1c0e (patch) | |
| tree | 6cb525c7fdb38ee631d741c2f32bcaf2fffa5f07 /builtin/fast-import.c | |
| parent | The fifth batch (diff) | |
| parent | hash.h: drop unsafe_ function variants (diff) | |
| download | git-0cbcba54550b1ea108e977c24b835e07b96b1c0e.tar.gz git-0cbcba54550b1ea108e977c24b835e07b96b1c0e.zip | |
Merge branch 'tb/unsafe-hash-cleanup' into ps/hash-cleanup
* 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
Diffstat (limited to 'builtin/fast-import.c')
| -rw-r--r-- | builtin/fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 2da46fecdc..ccdada1810 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -1106,7 +1106,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark) || (pack_size + PACK_SIZE_THRESHOLD + len) < pack_size) cycle_packfile(); - the_hash_algo->unsafe_init_fn(&checkpoint.ctx); + hashfile_checkpoint_init(pack_file, &checkpoint); hashfile_checkpoint(pack_file, &checkpoint); offset = checkpoint.offset; |