From: brian m. carlson Date: Sat, 07 Mar 2015 23:24:01 GMT Subject: [PATCH v2 06/10] bulk-checkin.c: convert to use struct object_id Message-ID: <1425770645-628957-7-git-send-email-sandals@crustytoothpaste.net> In-Reply-To: <1425770645-628957-1-git-send-email-sandals@crustytoothpaste.net> Signed-off-by: brian m. carlson --- bulk-checkin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bulk-checkin.c b/bulk-checkin.c index 0c4b8a7..e50f60e 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -24,7 +24,7 @@ static struct bulk_checkin_state { static void finish_bulk_checkin(struct bulk_checkin_state *state) { - unsigned char sha1[20]; + struct object_id oid; struct strbuf packname = STRBUF_INIT; int i; @@ -36,11 +36,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, oid.sha1, 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, oid.sha1, 0); + fixup_pack_header_footer(fd, oid.sha1, state->pack_tmp_name, + state->nr_written, oid.sha1, state->offset); close(fd); } @@ -48,7 +48,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, oid.sha1); for (i = 0; i < state->nr_written; i++) free(state->written[i]); -- 2.2.1.209.g41e5f3a