diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-09-09 23:24:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 01:23:11 (GMT) |
| commit | 66833f0e70c473ca6c4e6a79d34e879d8b40ba9d (patch) | |
| tree | a6708df628cdb5a5a2a8b83867a7b2407501d916 /bulk-checkin.c | |
| parent | ae44b5a4f3b091bc77adc4a70e7bfefd569b78a8 (diff) | |
| download | git-66833f0e70c473ca6c4e6a79d34e879d8b40ba9d.zip git-66833f0e70c473ca6c4e6a79d34e879d8b40ba9d.tar.gz git-66833f0e70c473ca6c4e6a79d34e879d8b40ba9d.tar.bz2 | |
pack-write: refactor renaming in finish_tmp_packfile()
Refactor the renaming in finish_tmp_packfile() into a helper function.
The callers are now expected to pass a "name_buffer" ending in
"pack-OID." instead of the previous "pack-", we then append "pack",
"idx" or "rev" to it.
By doing the strbuf_setlen() in rename_tmp_packfile() we reuse the
buffer and avoid the repeated allocations we'd get if that function had
its own temporary "struct strbuf".
This approach of reusing the buffer does make the last user in
pack-object.c's write_pack_file() slightly awkward, since we needlessly
do a strbuf_setlen() before calling strbuf_release() for consistency. In
subsequent changes we'll move that bitmap writing code around, so let's
not skip the strbuf_setlen() now.
The previous strbuf_reset() idiom originated with 5889271114a
(finish_tmp_packfile():use strbuf for pathname construction,
2014-03-03), which in turn was a minimal adjustment of pre-strbuf code
added in 0e990530ae (finish_tmp_packfile(): a helper function,
2011-10-28).
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>
Diffstat (limited to 'bulk-checkin.c')
| -rw-r--r-- | bulk-checkin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index 6283bc8..c19d471 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -46,7 +46,8 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) close(fd); } - strbuf_addf(&packname, "%s/pack/pack-", get_object_directory()); + strbuf_addf(&packname, "%s/pack/pack-%s.", get_object_directory(), + hash_to_hex(hash)); finish_tmp_packfile(&packname, state->pack_tmp_name, state->written, state->nr_written, &state->pack_idx_opts, hash); |