diff options
| -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, |