diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-03-15 13:30:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-15 13:30:37 -0700 |
| commit | 00997924001f3d8a07510613ab44d16c0a9b2883 (patch) | |
| tree | 7cb0ae32b7f4b80ee6538774596f3cfdc4239f3f /bulk-checkin.c | |
| parent | The tenth batch (diff) | |
| parent | core.fsync: documentation and user-friendly aggregate options (diff) | |
| download | tgif-00997924001f3d8a07510613ab44d16c0a9b2883.tar.xz | |
Merge branch 'ns/core-fsyncmethod' into ps/fsync-refs
* ns/core-fsyncmethod:
core.fsync: documentation and user-friendly aggregate options
core.fsync: new option to harden the index
core.fsync: add configuration parsing
core.fsync: introduce granular fsync control infrastructure
core.fsyncmethod: add writeout-only mode
wrapper: make inclusion of Windows csprng header tightly scoped
Diffstat (limited to 'bulk-checkin.c')
| -rw-r--r-- | bulk-checkin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index 8785b2ac80..a2cf9dcbc8 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -53,9 +53,10 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) unlink(state->pack_tmp_name); goto clear_exit; } else if (state->nr_written == 1) { - finalize_hashfile(state->f, hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); + finalize_hashfile(state->f, hash, FSYNC_COMPONENT_PACK, + CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); } else { - int fd = finalize_hashfile(state->f, hash, 0); + int fd = finalize_hashfile(state->f, hash, FSYNC_COMPONENT_PACK, 0); fixup_pack_header_footer(fd, hash, state->pack_tmp_name, state->nr_written, hash, state->offset); |