diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 08:59:20 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 08:59:20 +0200 |
commit | b10edb2df55241b2e042b3d5473537904d09d193 (patch) | |
tree | 0e456f3d65f1268c364a8d6d2b463456f23e222a /bulk-checkin.c | |
parent | Merge branch 'js/empty-config-section-fix' (diff) | |
parent | commit-graph: implement "--append" option (diff) | |
download | git-b10edb2df55241b2e042b3d5473537904d09d193.tar.xz git-b10edb2df55241b2e042b3d5473537904d09d193.zip |
Merge branch 'ds/commit-graph'
Precompute and store information necessary for ancestry traversal
in a separate file to optimize graph walking.
* ds/commit-graph:
commit-graph: implement "--append" option
commit-graph: build graph from starting commits
commit-graph: read only from specific pack-indexes
commit: integrate commit graph with commit parsing
commit-graph: close under reachability
commit-graph: add core.commitGraph setting
commit-graph: implement git commit-graph read
commit-graph: implement git-commit-graph write
commit-graph: implement write_commit_graph()
commit-graph: create git-commit-graph builtin
graph: add commit graph design document
commit-graph: add format document
csum-file: refactor finalize_hashfile() method
csum-file: rename hashclose() to finalize_hashfile()
Diffstat (limited to 'bulk-checkin.c')
-rw-r--r-- | bulk-checkin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index de1f4040c7..c0bc8de107 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -36,9 +36,9 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) unlink(state->pack_tmp_name); goto clear_exit; } else if (state->nr_written == 1) { - hashclose(state->f, oid.hash, CSUM_FSYNC); + finalize_hashfile(state->f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); } else { - int fd = hashclose(state->f, oid.hash, 0); + int fd = finalize_hashfile(state->f, oid.hash, 0); fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name, state->nr_written, oid.hash, state->offset); |