pack-write: use hash_to_hex when writing checksums
Pack checksums always use the current hash algorithm in use, so switch from sha1_to_hex to hash_to_hex. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Aug 18, 2019 at 20:04 UTC
894c0f66bb21189d0677be6ecb9923b6acfbf437
1 file changed
+4
-4
pack-write.c
+4
-4
@@ -349,7 +349,7 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
349
struct pack_idx_entry **written_list,
350
uint32_t nr_written,
351
struct pack_idx_option *pack_idx_opts,
352
- unsigned char sha1[])
352
+ unsigned char hash[])
353
{
354
const char *idx_tmp_name;
355
int basename_len = name_buffer->len;
@@ -358,18 +358,18 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
358
die_errno("unable to make temporary pack file readable");
359
360
idx_tmp_name = write_idx_file(NULL, written_list, nr_written,
361
- pack_idx_opts, sha1);
361
+ pack_idx_opts, hash);
362
if (adjust_shared_perm(idx_tmp_name))
363
die_errno("unable to make temporary index file readable");
364
365
- strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1));
365
+ strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash));
366
367
if (rename(pack_tmp_name, name_buffer->buf))
368
die_errno("unable to rename temporary pack file");
369
370
strbuf_setlen(name_buffer, basename_len);
371
372
- strbuf_addf(name_buffer, "%s.idx", sha1_to_hex(sha1));
372
+ strbuf_addf(name_buffer, "%s.idx", hash_to_hex(hash));
373
if (rename(idx_tmp_name, name_buffer->buf))
374
die_errno("unable to rename temporary index file");
375