diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2018-04-02 16:34:14 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-04-02 14:27:30 -0700 |
| commit | f2af9f5e02380ba3868df7daa34368945d500206 (patch) | |
| tree | d0d2a5d6872fb542477b87254c20e6d0cd7fe5a6 /builtin | |
| parent | Merge branch 'jk/cached-commit-buffer' into HEAD (diff) | |
| download | tgif-f2af9f5e02380ba3868df7daa34368945d500206.tar.xz | |
csum-file: rename hashclose() to finalize_hashfile()
The hashclose() method behaves very differently depending on the flags
parameter. In particular, the file descriptor is not always closed.
Perform a simple rename of "hashclose()" to "finalize_hashfile()" in
preparation for functional changes.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 2 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 7e3e1a461c..ca5a3d0248 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1269,7 +1269,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha nr_objects - nr_objects_initial); stop_progress_msg(&progress, msg.buf); strbuf_release(&msg); - hashclose(f, tail_hash, 0); + finalize_hashfile(f, tail_hash, 0); hashcpy(read_hash, pack_hash); fixup_pack_header_footer(output_fd, pack_hash, curr_pack, nr_objects, diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 5c674b2843..5126623e03 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -837,11 +837,11 @@ static void write_pack_file(void) * If so, rewrite it like in fast-import */ if (pack_to_stdout) { - hashclose(f, oid.hash, CSUM_CLOSE); + finalize_hashfile(f, oid.hash, CSUM_CLOSE); } else if (nr_written == nr_remaining) { - hashclose(f, oid.hash, CSUM_FSYNC); + finalize_hashfile(f, oid.hash, CSUM_FSYNC); } else { - int fd = hashclose(f, oid.hash, 0); + int fd = finalize_hashfile(f, oid.hash, 0); fixup_pack_header_footer(fd, oid.hash, pack_tmp_name, nr_written, oid.hash, offset); close(fd); |