Skip to content

Commit 894c0f6

Browse files
bk2204gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4439c7a commit 894c0f6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pack-write.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
349349
struct pack_idx_entry **written_list,
350350
uint32_t nr_written,
351351
struct pack_idx_option *pack_idx_opts,
352-
unsigned char sha1[])
352+
unsigned char hash[])
353353
{
354354
const char *idx_tmp_name;
355355
int basename_len = name_buffer->len;
@@ -358,18 +358,18 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
358358
die_errno("unable to make temporary pack file readable");
359359

360360
idx_tmp_name = write_idx_file(NULL, written_list, nr_written,
361-
pack_idx_opts, sha1);
361+
pack_idx_opts, hash);
362362
if (adjust_shared_perm(idx_tmp_name))
363363
die_errno("unable to make temporary index file readable");
364364

365-
strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1));
365+
strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash));
366366

367367
if (rename(pack_tmp_name, name_buffer->buf))
368368
die_errno("unable to rename temporary pack file");
369369

370370
strbuf_setlen(name_buffer, basename_len);
371371

372-
strbuf_addf(name_buffer, "%s.idx", sha1_to_hex(sha1));
372+
strbuf_addf(name_buffer, "%s.idx", hash_to_hex(hash));
373373
if (rename(idx_tmp_name, name_buffer->buf))
374374
die_errno("unable to rename temporary index file");
375375

0 commit comments

Comments
 (0)