Skip to content

Commit

Permalink
pack-bitmap: make bitmap_writer_push_bitmapped_commit() public
Browse files Browse the repository at this point in the history
The pseudo-merge selection code will be added in a subsequent commit,
and will need a way to push the allocated commit structures into the
bitmap writer from a separate compilation unit.

Make the `bitmap_writer_push_bitmapped_commit()` function part of the
pack-bitmap.h header in order to make this possible.

Signed-off-by: Taylor Blau <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
ttaylorr authored and gitster committed May 24, 2024
1 parent 245a7f2 commit c059c87
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 4 additions & 5 deletions pack-bitmap-write.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,8 @@ int bitmap_writer_has_bitmapped_object_id(struct bitmap_writer *writer,
* Compute the actual bitmaps
*/

static inline void push_bitmapped_commit(struct bitmap_writer *writer,
struct commit *commit,
unsigned pseudo_merge)
void bitmap_writer_push_commit(struct bitmap_writer *writer,
struct commit *commit, unsigned pseudo_merge)
{
if (writer->selected_nr >= writer->selected_alloc) {
writer->selected_alloc = (writer->selected_alloc + 32) * 2;
Expand Down Expand Up @@ -664,7 +663,7 @@ void bitmap_writer_select_commits(struct bitmap_writer *writer,

if (indexed_commits_nr < 100) {
for (i = 0; i < indexed_commits_nr; ++i)
push_bitmapped_commit(writer, indexed_commits[i], 0);
bitmap_writer_push_commit(writer, indexed_commits[i], 0);
return;
}

Expand Down Expand Up @@ -697,7 +696,7 @@ void bitmap_writer_select_commits(struct bitmap_writer *writer,
}
}

push_bitmapped_commit(writer, chosen, 0);
bitmap_writer_push_commit(writer, chosen, 0);

i += next + 1;
display_progress(writer->progress, i);
Expand Down
2 changes: 2 additions & 0 deletions pack-bitmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ void bitmap_writer_build_type_index(struct bitmap_writer *writer,
uint32_t index_nr);
int bitmap_writer_has_bitmapped_object_id(struct bitmap_writer *writer,
const struct object_id *oid);
void bitmap_writer_push_commit(struct bitmap_writer *writer,
struct commit *commit, unsigned pseudo_merge);
uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git,
struct packing_data *mapping);
int rebuild_bitmap(const uint32_t *reposition,
Expand Down

0 comments on commit c059c87

Please sign in to comment.