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>

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 6e77dfd44439f4c5f928a73dce3233ff6e63c3b4..d2d97cc61e66891d12757f6466c6df4ec2e53386 100644 (file)
--- 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;
 }
 
        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;
 
                                        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;
 
                return 0;
 

-       if (!want_object_in_pack(sha1, 0, &pack, &offset))
+       if (!want_object_in_pack(oid->hash, 0, &pack, &offset))

                return 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;
 
        display_progress(progress_state, nr_result);
        return 1;

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index c1c74d4a7956430fca46fd743946280daf2f0f3f..9bf8d5991cb78f56f0c29230483a0b925e8ade58 100644 (file)
--- 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(
 }
 
 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)
 {
        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;
 }
 
        return 1;
 }
 

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 42e3d5f4f26ee0f31d13c2a3d15bc31da5f7c1d4..9270983e5f581e40f894a8885396e43d13e71015 100644 (file)
--- 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];
                        continue;
 
                obj = eindex->objects[i];

-               show_reach(obj->oid.hash, obj->type, 0, eindex->hashes[i], NULL, 0);
+               show_reach(&obj->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) {
                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;
 
                        struct revindex_entry *entry;
                        uint32_t hash = 0;
 


@@ -625,12 +625,12 @@ static void show_objects_for_type(
                                continue;
 
                        entry = &bitmap_git.pack->revindex[pos + offset];
                                continue;
 
                        entry = &bitmap_git.pack->revindex[pos + offset];

-                       sha1 = nth_packed_object_sha1(bitmap_git.pack, entry->nr);
+                       nth_packed_object_oid(&oid, bitmap_git.pack, entry->nr);

 
                        if (bitmap_git.hashes)
                                hash = get_be32(bitmap_git.hashes + 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(&oid, object_type, 0, hash, bitmap_git.pack, entry->offset);

                }
 
                pos += BITS_IN_EWORD;
                }
 
                pos += BITS_IN_EWORD;

diff --git a/pack-bitmap.h b/pack-bitmap.h
index 0adcef77b58cc13822f1b400d5418ec6f8b34421..3742a00e14a0d4da335253b2a76f978edb499d35 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -27,7 +27,7 @@ enum pack_bitmap_flags {
 };
 
 typedef int (*show_reachable_fn)(
 };
 
 typedef int (*show_reachable_fn)(

-       const unsigned char *sha1,
+       const struct object_id *oid,

        enum object_type type,
        int flags,
        uint32_t hash,
        enum object_type type,
        int flags,
        uint32_t hash,