diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-10-15 22:07:00 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-16 11:05:51 +0900 |
| commit | 206649672e9cae1af7f1e23ea6648b39d73b71a4 (patch) | |
| tree | 609f00a212363c2cb5b2bfb291aae4929a58a88c /builtin/pack-objects.c | |
| parent | 334dc52f49ee3e56a32142d3500fe93ef79aac67 (diff) | |
| download | git-206649672e9cae1af7f1e23ea6648b39d73b71a4.tar.gz | |
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>
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 6e77dfd444..d2d97cc61e 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -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; |