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

pack-bitmap: drop redundant args from bitmap_writer_build()

Browse Source 
In a similar fashion as the previous commit, drop a redundant argument
from the `bitmap_writer_build()` function.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2024-08-15 13:31:06 -04:00 committed by Junio C Hamano
parent 125ee4ae80
commit f00dda4849
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pack-objects.c
View File

@ -1367,7 +1367,7 @@ static void write_pack_file(void)
bitmap_writer_select_commits(&bitmap_writer, bitmap_writer_select_commits(&bitmap_writer,
indexed_commits, indexed_commits,
indexed_commits_nr); indexed_commits_nr);
if (bitmap_writer_build(&bitmap_writer, &to_pack) < 0) if (bitmap_writer_build(&bitmap_writer) < 0)
die(_("failed to write bitmap index")); die(_("failed to write bitmap index"));
bitmap_writer_finish(&bitmap_writer, bitmap_writer_finish(&bitmap_writer,
written_list, nr_written, written_list, nr_written,

2
midx-write.c
View File

@ -846,7 +846,7 @@ static int write_midx_bitmap(const char *midx_name,
index[pack_order[i]] = &pdata->objects[i].idx; index[pack_order[i]] = &pdata->objects[i].idx;
bitmap_writer_select_commits(&writer, commits, commits_nr); bitmap_writer_select_commits(&writer, commits, commits_nr);
ret = bitmap_writer_build(&writer, pdata); ret = bitmap_writer_build(&writer);
if (ret < 0) if (ret < 0)
goto cleanup; goto cleanup;

9
pack-bitmap-write.c
View File

@ -569,8 +569,7 @@ static void store_selected(struct bitmap_writer *writer,
kh_value(writer->bitmaps, hash_pos) = stored; kh_value(writer->bitmaps, hash_pos) = stored;
} }
int bitmap_writer_build(struct bitmap_writer *writer, int bitmap_writer_build(struct bitmap_writer *writer)
struct packing_data *to_pack)
{ {
struct bitmap_builder bb; struct bitmap_builder bb;
size_t i; size_t i;
@ -581,17 +580,15 @@ int bitmap_writer_build(struct bitmap_writer *writer,
uint32_t *mapping; uint32_t *mapping;
int closed = 1; /* until proven otherwise */ int closed = 1; /* until proven otherwise */
writer->to_pack = to_pack;
if (writer->show_progress) if (writer->show_progress)
writer->progress = start_progress("Building bitmaps", writer->progress = start_progress("Building bitmaps",
writer->selected_nr); writer->selected_nr);
trace2_region_enter("pack-bitmap-write", "building_bitmaps_total", trace2_region_enter("pack-bitmap-write", "building_bitmaps_total",
the_repository); the_repository);
old_bitmap = prepare_bitmap_git(to_pack->repo); old_bitmap = prepare_bitmap_git(writer->to_pack->repo);
if (old_bitmap) if (old_bitmap)
mapping = create_bitmap_mapping(old_bitmap, to_pack); mapping = create_bitmap_mapping(old_bitmap, writer->to_pack);
else else
mapping = NULL; mapping = NULL;

3
pack-bitmap.h
View File

@ -146,8 +146,7 @@ struct ewah_bitmap *pseudo_merge_bitmap_for_commit(struct bitmap_index *bitmap_g
void bitmap_writer_select_commits(struct bitmap_writer *writer, void bitmap_writer_select_commits(struct bitmap_writer *writer,
struct commit **indexed_commits, struct commit **indexed_commits,
unsigned int indexed_commits_nr); unsigned int indexed_commits_nr);
int bitmap_writer_build(struct bitmap_writer *writer, int bitmap_writer_build(struct bitmap_writer *writer);
struct packing_data *to_pack);
void bitmap_writer_finish(struct bitmap_writer *writer, void bitmap_writer_finish(struct bitmap_writer *writer,
struct pack_idx_entry **index, struct pack_idx_entry **index,
uint32_t index_nr, uint32_t index_nr,