diff options
| author | Taylor Blau <me@ttaylorr.com> | 2024-05-14 15:57:00 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-15 06:52:32 -0700 |
| commit | 9675b0691732d5475a353a69c3a8e14804b22a64 (patch) | |
| tree | dda533669a2d31605801041dd205d4385f17dbb7 | |
| parent | 07647c92ffabbb639436de8b5634244cbdfd6ef2 (diff) | |
| download | git-9675b0691732d5475a353a69c3a8e14804b22a64.tar.gz | |
pack-bitmap: drop unused `max_bitmaps` parameter
The `max_bitmaps` parameter in `bitmap_writer_select_commits()` was
introduced back in 7cc8f97108 (pack-objects: implement bitmap writing,
2013-12-21), making it original to the bitmap implementation in Git
itself.
When that patch was merged via 0f9e62e084 (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 via c528e17966
(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 since 0f9e62e084, 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>
| -rw-r--r-- | builtin/pack-objects.c | 3 | ||||
| -rw-r--r-- | midx-write.c | 2 | ||||
| -rw-r--r-- | pack-bitmap-write.c | 8 | ||||
| -rw-r--r-- | pack-bitmap.h | 3 |
4 files changed, 4 insertions, 12 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index ba4c93d241..10e69fdc8e 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -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, diff --git a/midx-write.c b/midx-write.c index 5fdc8f2ff5..78fb0a2c8c 100644 --- a/midx-write.c +++ b/midx-write.c @@ -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; diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index e22fa70745..c0087dab12 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -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 { diff --git a/pack-bitmap.h b/pack-bitmap.h index 5a1890a2c5..b2d13d40eb 100644 --- a/pack-bitmap.h +++ b/pack-bitmap.h @@ -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, |