diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2019-02-19 00:04:55 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-01 11:57:37 +0900 |
| commit | 53636539d37007099f14249a5dae4c05dc72ace4 (patch) | |
| tree | 053e123f50b67b1effadf5b66dfd561ab1670c8b /pack-bitmap.c | |
| parent | pack-bitmap: make bitmap header handling hash agnostic (diff) | |
| download | tgif-53636539d37007099f14249a5dae4c05dc72ace4.tar.xz | |
pack-bitmap: convert struct stored_bitmap to object_id
Convert struct stored_bitmap to use struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap.c')
| -rw-r--r-- | pack-bitmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index b53f37243c..c760913cea 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -18,7 +18,7 @@ * commit. */ struct stored_bitmap { - unsigned char sha1[20]; + struct object_id oid; struct ewah_bitmap *root; struct stored_bitmap *xor; int flags; @@ -181,9 +181,9 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index, stored->root = root; stored->xor = xor_with; stored->flags = flags; - hashcpy(stored->sha1, sha1); + oidread(&stored->oid, sha1); - hash_pos = kh_put_sha1(index->bitmaps, stored->sha1, &ret); + hash_pos = kh_put_sha1(index->bitmaps, stored->oid.hash, &ret); /* a 0 return code means the insertion succeeded with no changes, * because the SHA1 already existed on the map. this is bad, there @@ -1080,7 +1080,7 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git, lookup_stored_bitmap(stored), rebuild)) { hash_pos = kh_put_sha1(reused_bitmaps, - stored->sha1, + stored->oid.hash, &hash_ret); kh_value(reused_bitmaps, hash_pos) = bitmap_to_ewah(rebuild); |