pack-bitmap: drop unused `max_bitmaps` parameter
The `max_bitmaps` parameter in `bitmap_writer_select_commits()` was introduced back inmaint7cc8f97108
(pack-objects: implement bitmap writing, 2013-12-21), making it original to the bitmap implementation in Git itself. When that patch was merged via0f9e62e084
(Merge branch 'jk/pack-bitmap', 2014-02-27), its sole caller in builtin/pack-objects.c passed a value of "-1" for `max_bitmaps`, indicating no limit. Since then, the only other caller (in midx.c, added viac528e17966
(pack-bitmap: write multi-pack bitmaps, 2021-08-31)) also uses a value of "-1" for `max_bitmaps`. Since no callers have needed a finite limit for the `max_bitmaps` parameter in the nearly decade that has passed since0f9e62e084
, let's remove the parameter and any dead pieces of code connected to it. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
parent
07647c92ff
commit
9675b06917
|
@ -1364,8 +1364,7 @@ static void write_pack_file(void)
|
|||
progress);
|
||||
bitmap_writer_select_commits(&bitmap_writer,
|
||||
indexed_commits,
|
||||
indexed_commits_nr,
|
||||
-1);
|
||||
indexed_commits_nr);
|
||||
if (bitmap_writer_build(&bitmap_writer, &to_pack) < 0)
|
||||
die(_("failed to write bitmap index"));
|
||||
bitmap_writer_finish(&bitmap_writer,
|
||||
|
|
|
@ -841,7 +841,7 @@ static int write_midx_bitmap(const char *midx_name,
|
|||
for (i = 0; i < pdata->nr_objects; i++)
|
||||
index[pack_order[i]] = &pdata->objects[i].idx;
|
||||
|
||||
bitmap_writer_select_commits(&writer, commits, commits_nr, -1);
|
||||
bitmap_writer_select_commits(&writer, commits, commits_nr);
|
||||
ret = bitmap_writer_build(&writer, pdata);
|
||||
if (ret < 0)
|
||||
goto cleanup;
|
||||
|
|
|
@ -587,8 +587,7 @@ static int date_compare(const void *_a, const void *_b)
|
|||
|
||||
void bitmap_writer_select_commits(struct bitmap_writer *writer,
|
||||
struct commit **indexed_commits,
|
||||
unsigned int indexed_commits_nr,
|
||||
int max_bitmaps)
|
||||
unsigned int indexed_commits_nr)
|
||||
{
|
||||
unsigned int i = 0, j, next;
|
||||
|
||||
|
@ -611,11 +610,6 @@ void bitmap_writer_select_commits(struct bitmap_writer *writer,
|
|||
if (i + next >= indexed_commits_nr)
|
||||
break;
|
||||
|
||||
if (max_bitmaps > 0 && writer->selected_nr >= max_bitmaps) {
|
||||
writer->selected_nr = max_bitmaps;
|
||||
break;
|
||||
}
|
||||
|
||||
if (next == 0) {
|
||||
chosen = indexed_commits[i];
|
||||
} else {
|
||||
|
|
|
@ -131,8 +131,7 @@ struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
|
|||
struct commit *commit);
|
||||
void bitmap_writer_select_commits(struct bitmap_writer *writer,
|
||||
struct commit **indexed_commits,
|
||||
unsigned int indexed_commits_nr,
|
||||
int max_bitmaps);
|
||||
unsigned int indexed_commits_nr);
|
||||
int bitmap_writer_build(struct bitmap_writer *writer,
|
||||
struct packing_data *to_pack);
|
||||
void bitmap_writer_finish(struct bitmap_writer *writer,
|
||||
|
|
Loading…
Reference in New Issue