pack-bitmap: replace sha1_to_hex

Replace the uses of sha1_to_hex in the pack bitmap code with hash_to_hex
to allow the use of SHA-256 as well.  Rename a few variables since they
are no longer limited to SHA-1.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index c82fb01fd758ae328b1b9eb05623b7263a43d5fe..802ed62677dc995cc08d747a7c85dc1f17109503 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -142,13 +142,13 @@ static inline void reset_all_seen(void)
        seen_objects_nr = 0;
 }
 
        seen_objects_nr = 0;
 }
 

-static uint32_t find_object_pos(const unsigned char *sha1)
+static uint32_t find_object_pos(const unsigned char *hash)

 {
 {

-       struct object_entry *entry = packlist_find(writer.to_pack, sha1, NULL);
+       struct object_entry *entry = packlist_find(writer.to_pack, hash, NULL);

 
        if (!entry) {
                die("Failed to write bitmap index. Packfile doesn't have full closure "
 
        if (!entry) {
                die("Failed to write bitmap index. Packfile doesn't have full closure "

-                       "(object %s is missing)", sha1_to_hex(sha1));
+                       "(object %s is missing)", hash_to_hex(hash));

        }
 
        return oe_in_pack_pos(writer.to_pack, entry);
        }
 
        return oe_in_pack_pos(writer.to_pack, entry);

diff --git a/pack-bitmap.c b/pack-bitmap.c
index c760913cea2127e528d6d62319089393d14b3148..6d6fa68563b7b6459900ab8dea461f7abe9e24bd 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -169,7 +169,7 @@ static int load_bitmap_header(struct bitmap_index *index)
 
 static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
                                          struct ewah_bitmap *root,
 
 static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
                                          struct ewah_bitmap *root,

-                                         const unsigned char *sha1,
+                                         const unsigned char *hash,

                                          struct stored_bitmap *xor_with,
                                          int flags)
 {
                                          struct stored_bitmap *xor_with,
                                          int flags)
 {


@@ -181,7 +181,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
        stored->root = root;
        stored->xor = xor_with;
        stored->flags = flags;
        stored->root = root;
        stored->xor = xor_with;
        stored->flags = flags;

-       oidread(&stored->oid, sha1);
+       oidread(&stored->oid, hash);

 
        hash_pos = kh_put_sha1(index->bitmaps, stored->oid.hash, &ret);
 
 
        hash_pos = kh_put_sha1(index->bitmaps, stored->oid.hash, &ret);
 


@@ -189,7 +189,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
         * because the SHA1 already existed on the map. this is bad, there
         * shouldn't be duplicated commits in the index */
        if (ret == 0) {
         * because the SHA1 already existed on the map. this is bad, there
         * shouldn't be duplicated commits in the index */
        if (ret == 0) {

-               error("Duplicate entry in bitmap index: %s", sha1_to_hex(sha1));
+               error("Duplicate entry in bitmap index: %s", hash_to_hex(hash));

                return NULL;
        }
 
                return NULL;
        }
 


@@ -805,7 +805,7 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
 
                fprintf(stderr, "Failed to reuse at %d (%016llx)\n",
                        reuse_objects, result->words[i]);
 
                fprintf(stderr, "Failed to reuse at %d (%016llx)\n",
                        reuse_objects, result->words[i]);

-               fprintf(stderr, " %s\n", sha1_to_hex(sha1));
+               fprintf(stderr, " %s\n", hash_to_hex(sha1));

        }
 #endif
 
        }
 #endif