Re: [PATCH v2 12/24] pack-bitmap: convert traverse_bitmap_commit_list to object_id

[Jonathan Nieder]

brian m. carlson wrote:

> Convert traverse_bitmap_commit_list and the callbacks it takes to use a
> pointer to struct object_id.
>
> Signed-off-by: brian m. carlson 
> ---
>  builtin/pack-objects.c | 8 
>  builtin/rev-list.c | 4 ++--
>  pack-bitmap.c  | 8 
>  pack-bitmap.h  | 2 +-
>  4 files changed, 11 insertions(+), 11 deletions(-)

Reviewed-by: Jonathan Nieder 

[PATCH v2 12/24] pack-bitmap: convert traverse_bitmap_commit_list to object_id

[brian m. carlson]

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

Signed-off-by: brian m. carlson 
---
 builtin/pack-objects.c | 8 
 builtin/rev-list.c | 4 ++--
 pack-bitmap.c  | 8 
 pack-bitmap.h  | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 5ee2c48ffb..180c17904b 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, _pos))
+   if (have_duplicate_entry(oid->hash, 0, _pos))
return 0;
 
-   if (!want_object_in_pack(sha1, 0, , ))
+   if (!want_object_in_pack(oid->hash, 0, , ))
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;
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index c1c74d4a79..9bf8d5991c 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -258,14 +258,14 @@ static int show_bisect_vars(struct rev_list_info *info, 
int reaches, int all)
 }
 
 static int show_object_fast(
-   const unsigned char *sha1,
+   const struct object_id *oid,
enum object_type type,
int exclude,
uint32_t name_hash,
struct packed_git *found_pack,
off_t found_offset)
 {
-   fprintf(stdout, "%s\n", sha1_to_hex(sha1));
+   fprintf(stdout, "%s\n", oid_to_hex(oid));
return 1;
 }
 
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 42e3d5f4f2..9270983e5f 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -587,7 +587,7 @@ static void show_extended_objects(struct bitmap *objects,
continue;
 
obj = eindex->objects[i];
-   show_reach(obj->oid.hash, obj->type, 0, eindex->hashes[i], 
NULL, 0);
+   show_reach(>oid, obj->type, 0, eindex->hashes[i], NULL, 0);
}
 }
 
@@ -612,7 +612,7 @@ static void show_objects_for_type(
eword_t word = objects->words[i] & filter;
 
for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
-   const unsigned char *sha1;
+   struct object_id oid;
struct revindex_entry *entry;
uint32_t hash = 0;
 
@@ -625,12 +625,12 @@ static void show_objects_for_type(
continue;
 
entry = _git.pack->revindex[pos + offset];
-   sha1 = nth_packed_object_sha1(bitmap_git.pack, 
entry->nr);
+   nth_packed_object_oid(, bitmap_git.pack, entry->nr);
 
if (bitmap_git.hashes)
hash = get_be32(bitmap_git.hashes + entry->nr);
 
-   show_reach(sha1, object_type, 0, hash, bitmap_git.pack, 
entry->offset);
+   show_reach(, object_type, 0, hash, bitmap_git.pack, 
entry->offset);
}
 
pos += BITS_IN_EWORD;
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 0adcef77b5..3742a00e14 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -27,7 +27,7 @@ enum pack_bitmap_flags {
 };
 
 typedef int (*show_reachable_fn)(
-   const unsigned char *sha1,
+   const struct object_id *oid,
enum object_type type,
int flags,
uint32_t hash,
-- 
2.14.2.920.gcf0c67979c