зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
0f4d6cada8
Коммит
53636539d3
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче