pack-bitmap: convert traverse_bitmap_commit_list to object_id

Convert traverse_bitmap_commit_list and the callbacks it takes to use a
pointer to struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2017-10-15 22:07:00 +00:00
committed by Junio C Hamano
parent 334dc52f49
commit 206649672e
4 changed files with 11 additions and 11 deletions

View File

@ -1097,20 +1097,20 @@ static int add_object_entry(const unsigned char *sha1, enum object_type type,
return 1;
}
static int add_object_entry_from_bitmap(const unsigned char *sha1,
static int add_object_entry_from_bitmap(const struct object_id *oid,
enum object_type type,
int flags, uint32_t name_hash,
struct packed_git *pack, off_t offset)
{
uint32_t index_pos;
if (have_duplicate_entry(sha1, 0, &index_pos))
if (have_duplicate_entry(oid->hash, 0, &index_pos))
return 0;
if (!want_object_in_pack(sha1, 0, &pack, &offset))
if (!want_object_in_pack(oid->hash, 0, &pack, &offset))
return 0;
create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset);
create_object_entry(oid->hash, type, name_hash, 0, 0, index_pos, pack, offset);
display_progress(progress_state, nr_result);
return 1;