mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bulk-checkin.c: convert to use struct object_id

Browse Source 
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2015-03-13 23:39:32 +00:00
committed by Junio C Hamano
parent aeecdcd4c1
commit fa33c3aae2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bulk-checkin.c
View File

@ -24,7 +24,7 @@ static struct bulk_checkin_state {
static void finish_bulk_checkin(struct bulk_checkin_state *state) static void finish_bulk_checkin(struct bulk_checkin_state *state)
{ {
unsigned char sha1[20]; struct object_id oid;
struct strbuf packname = STRBUF_INIT; struct strbuf packname = STRBUF_INIT;
int i; int i;
@ -36,11 +36,11 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
unlink(state->pack_tmp_name); unlink(state->pack_tmp_name);
goto clear_exit; goto clear_exit;
} else if (state->nr_written == 1) { } else if (state->nr_written == 1) {
sha1close(state->f, sha1, CSUM_FSYNC); sha1close(state->f, oid.hash, CSUM_FSYNC);
} else { } else {
int fd = sha1close(state->f, sha1, 0); int fd = sha1close(state->f, oid.hash, 0);
fixup_pack_header_footer(fd, sha1, state->pack_tmp_name, fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name,
state->nr_written, sha1, state->nr_written, oid.hash,
state->offset); state->offset);
close(fd); 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()); strbuf_addf(&packname, "%s/pack/pack-", get_object_directory());
finish_tmp_packfile(&packname, state->pack_tmp_name, finish_tmp_packfile(&packname, state->pack_tmp_name,
state->written, state->nr_written, state->written, state->nr_written,
&state->pack_idx_opts, sha1); &state->pack_idx_opts, oid.hash);
for (i = 0; i < state->nr_written; i++) for (i = 0; i < state->nr_written; i++)
free(state->written[i]); free(state->written[i]);