pack-write: split up finish_tmp_packfile() function
Split up the finish_tmp_packfile() function and use the split-up version in pack-objects.c in preparation for moving the step of renaming the *.idx file later as part of a function change. Since the only other caller of finish_tmp_packfile() was in bulk-checkin.c, and it won't be needing a change to its *.idx renaming, provide a thin wrapper for the old function as a static function in that file. If other callers end up needing the simpler version it could be moved back to "pack-write.c" and "pack.h". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
522a5c2cf5
commit
2ec02dd5a8
@ -23,6 +23,22 @@ static struct bulk_checkin_state {
|
||||
uint32_t nr_written;
|
||||
} state;
|
||||
|
||||
static void finish_tmp_packfile(struct strbuf *basename,
|
||||
const char *pack_tmp_name,
|
||||
struct pack_idx_entry **written_list,
|
||||
uint32_t nr_written,
|
||||
struct pack_idx_option *pack_idx_opts,
|
||||
unsigned char hash[])
|
||||
{
|
||||
char *idx_tmp_name = NULL;
|
||||
|
||||
stage_tmp_packfiles(basename, pack_tmp_name, written_list, nr_written,
|
||||
pack_idx_opts, hash, &idx_tmp_name);
|
||||
rename_tmp_packfile_idx(basename, &idx_tmp_name);
|
||||
|
||||
free(idx_tmp_name);
|
||||
}
|
||||
|
||||
static void finish_bulk_checkin(struct bulk_checkin_state *state)
|
||||
{
|
||||
unsigned char hash[GIT_MAX_RAWSZ];
|
||||
|
Reference in New Issue
Block a user