diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 02:22:28 +0000 |
---|---|---|
committer | Jeff King <peff@peff.net> | 2015-11-20 08:02:05 -0500 |
commit | f2fd0760f62e79609fef7bfd7ecebb002e8e4ced (patch) | |
tree | 1f915114b015428730e95a89697783560b672008 /pack-bitmap-write.c | |
parent | 7999b2cf772956466baa8925491d6fb1b0963292 (diff) | |
download | git-f2fd0760f62e79609fef7bfd7ecebb002e8e4ced.tar.gz |
Convert struct object to object_id
struct object is one of the major data structures dealing with object
IDs. Convert it to use struct object_id instead of an unsigned char
array. Convert get_object_hash to refer to the new member as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'pack-bitmap-write.c')
-rw-r--r-- | pack-bitmap-write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 03f192664c..f3bffa7fe5 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -311,7 +311,7 @@ void bitmap_writer_build(struct packing_data *to_pack) hash_pos = kh_put_sha1(writer.bitmaps, get_object_hash(*object), &hash_ret); if (hash_ret == 0) die("Duplicate entry when writing index: %s", - sha1_to_hex(object->sha1)); + oid_to_hex(&object->oid)); kh_value(writer.bitmaps, hash_pos) = stored; display_progress(writer.progress, writer.selected_nr - i); |