diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2018-04-02 22:34:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-02 23:27:30 +0200 |
| commit | cfe83216e404223ce8c5f6ef79c4ba9a27ff872e (patch) | |
| tree | 6f64a9ccff4777e87bd43fdf8e051a215048ae63 /pack-bitmap-write.c | |
| parent | csum-file: rename hashclose() to finalize_hashfile() (diff) | |
| download | git-cfe83216e404223ce8c5f6ef79c4ba9a27ff872e.tar.xz git-cfe83216e404223ce8c5f6ef79c4ba9a27ff872e.zip | |
csum-file: refactor finalize_hashfile() method
If we want to use a hashfile on the temporary file for a lockfile, then
we need finalize_hashfile() to fully write the trailing hash but also keep
the file descriptor open.
Do this by adding a new CSUM_HASH_IN_STREAM flag along with a functional
change that checks this flag before writing the checksum to the stream.
This differs from previous behavior since it would be written if either
CSUM_CLOSE or CSUM_FSYNC is provided.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap-write.c')
| -rw-r--r-- | pack-bitmap-write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 662b44f97d..db4c832428 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -535,7 +535,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index, if (options & BITMAP_OPT_HASH_CACHE) write_hash_cache(f, index, index_nr); - finalize_hashfile(f, NULL, CSUM_FSYNC); + finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); if (adjust_shared_perm(tmp_file.buf)) die_errno("unable to make temporary bitmap file readable"); |