pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public

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 <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 299aa8af6f5fe2c3eb4340cb574caf32c7dcf0ff..bc19b33ad16d6c70f7262f9304d92ce098fadcbf 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -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;
@@ -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;
        }
 
@@ -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);

diff --git a/pack-bitmap.h b/pack-bitmap.h
index e175f28e0de8598e5109a683406bae1557f57a59..a7e2f56c971dbad02db28111519f7a5c136c4286 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -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,