[PATCH 6/9] bulk-checkin.c: convert to use struct object_id
From: brian m. carlson <hidden>
Date: 2016-06-15 23:00:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: brian m. carlson <redacted> --- bulk-checkin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 98e651c..92c7b5e 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c@@ -23,7 +23,7 @@ static struct bulk_checkin_state { static void finish_bulk_checkin(struct bulk_checkin_state *state) { - unsigned char sha1[20]; + struct object_id sha1; struct strbuf packname = STRBUF_INIT; int i;
@@ -35,11 +35,11 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) unlink(state->pack_tmp_name); goto clear_exit; } else if (state->nr_written == 1) { - sha1close(state->f, sha1, CSUM_FSYNC); + sha1close(state->f, sha1.oid, CSUM_FSYNC); } else { - int fd = sha1close(state->f, sha1, 0); - fixup_pack_header_footer(fd, sha1, state->pack_tmp_name, - state->nr_written, sha1, + int fd = sha1close(state->f, sha1.oid, 0); + fixup_pack_header_footer(fd, sha1.oid, state->pack_tmp_name, + state->nr_written, sha1.oid, state->offset); close(fd); }
@@ -47,7 +47,7 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) strbuf_addf(&packname, "%s/pack/pack-", get_object_directory()); finish_tmp_packfile(&packname, state->pack_tmp_name, state->written, state->nr_written, - &state->pack_idx_opts, sha1); + &state->pack_idx_opts, sha1.oid); for (i = 0; i < state->nr_written; i++) free(state->written[i]);
--
2.0.0.rc0