diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2019-08-18 20:04:17 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-19 15:04:58 -0700 |
| commit | 894c0f66bb21189d0677be6ecb9923b6acfbf437 (patch) | |
| tree | 7af949ad01ddb608e717b83545b22143b87a8862 | |
| parent | sequencer: convert to use the_hash_algo (diff) | |
| download | tgif-894c0f66bb21189d0677be6ecb9923b6acfbf437.tar.xz | |
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>
| -rw-r--r-- | pack-write.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pack-write.c b/pack-write.c index 29d17a9bec..f0017beb9d 100644 --- a/pack-write.c +++ b/pack-write.c @@ -349,7 +349,7 @@ void finish_tmp_packfile(struct strbuf *name_buffer, struct pack_idx_entry **written_list, uint32_t nr_written, struct pack_idx_option *pack_idx_opts, - unsigned char sha1[]) + unsigned char hash[]) { const char *idx_tmp_name; int basename_len = name_buffer->len; @@ -358,18 +358,18 @@ void finish_tmp_packfile(struct strbuf *name_buffer, die_errno("unable to make temporary pack file readable"); idx_tmp_name = write_idx_file(NULL, written_list, nr_written, - pack_idx_opts, sha1); + pack_idx_opts, hash); if (adjust_shared_perm(idx_tmp_name)) die_errno("unable to make temporary index file readable"); - strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1)); + strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash)); if (rename(pack_tmp_name, name_buffer->buf)) die_errno("unable to rename temporary pack file"); strbuf_setlen(name_buffer, basename_len); - strbuf_addf(name_buffer, "%s.idx", sha1_to_hex(sha1)); + strbuf_addf(name_buffer, "%s.idx", hash_to_hex(hash)); if (rename(idx_tmp_name, name_buffer->buf)) die_errno("unable to rename temporary index file"); |