mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-bitmap: convert struct stored_bitmap to object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson
2019-02-19 00:04:55 +00:00
committed by Junio C Hamano
parent 0f4d6cada8
commit 53636539d3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pack-bitmap.c
View File

@ -18,7 +18,7 @@
* commit. * commit.
*/ */
struct stored_bitmap { struct stored_bitmap {
unsigned char sha1[20]; struct object_id oid;
struct ewah_bitmap *root; struct ewah_bitmap *root;
struct stored_bitmap *xor; struct stored_bitmap *xor;
int flags; int flags;
@ -181,9 +181,9 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
stored->root = root; stored->root = root;
stored->xor = xor_with; stored->xor = xor_with;
stored->flags = flags; 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, /* a 0 return code means the insertion succeeded with no changes,
* because the SHA1 already existed on the map. this is bad, there * 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), lookup_stored_bitmap(stored),
rebuild)) { rebuild)) {
hash_pos = kh_put_sha1(reused_bitmaps, hash_pos = kh_put_sha1(reused_bitmaps,
stored->sha1, stored->oid.hash,
&hash_ret); &hash_ret);
kh_value(reused_bitmaps, hash_pos) = kh_value(reused_bitmaps, hash_pos) =
bitmap_to_ewah(rebuild); bitmap_to_ewah(rebuild);