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

pack-write: split up finish_tmp_packfile() function

Browse Source 
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:
Ævar Arnfjörð Bjarmason
2021-09-09 19:24:56 -04:00
committed by Junio C Hamano
parent 522a5c2cf5
commit 2ec02dd5a8
4 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/pack-objects.c
View File

@ -1217,6 +1217,7 @@ static void write_pack_file(void)
if (!pack_to_stdout) {
struct stat st;
struct strbuf tmpname = STRBUF_INIT;
char *idx_tmp_name = NULL;
/*
* Packs are runtime accessed in their mtime
@ -1246,9 +1247,10 @@ static void write_pack_file(void)
&to_pack, written_list, nr_written);
}
finish_tmp_packfile(&tmpname, pack_tmp_name,
stage_tmp_packfiles(&tmpname, pack_tmp_name,
written_list, nr_written,
&pack_idx_opts, hash);
&pack_idx_opts, hash, &idx_tmp_name);
rename_tmp_packfile_idx(&tmpname, &idx_tmp_name);
if (write_bitmap_index) {
size_t tmpname_len = tmpname.len;
@ -1265,6 +1267,7 @@ static void write_pack_file(void)
strbuf_setlen(&tmpname, tmpname_len);
}
free(idx_tmp_name);
strbuf_release(&tmpname);
free(pack_tmp_name);
puts(hash_to_hex(hash));