зеркало из https://github.com/microsoft/git.git
bulk-checkin.c: convert to use struct object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
aeecdcd4c1
Коммит
fa33c3aae2
|
@ -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.hash, 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.hash, 0);
|
||||
fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name,
|
||||
state->nr_written, oid.hash,
|
||||
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.hash);
|
||||
for (i = 0; i < state->nr_written; i++)
|
||||
free(state->written[i]);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче