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

Merge branch 'jt/remove-pack-bitmap-global'

Browse Source 
The effort to move globals to per-repository in-core structure
continues.

* jt/remove-pack-bitmap-global:
  pack-bitmap: add free function
  pack-bitmap: remove bitmap_git global variable
This commit is contained in:
Junio C Hamano
2018-07-18 12:20:30 -07:00
parent a4d4427bc6 f3c23db2d7
commit ad7b8a7c5a
5 changed files with 234 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pack-bitmap-write.c
View File

@ -361,11 +361,17 @@ static int date_compare(const void *_a, const void *_b)
void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack)
{
if (prepare_bitmap_git() < 0)
struct bitmap_index *bitmap_git;
if (!(bitmap_git = prepare_bitmap_git()))
return;
writer.reused = kh_init_sha1();
rebuild_existing_bitmaps(to_pack, writer.reused, writer.show_progress);
rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
writer.show_progress);
/*
* NEEDSWORK: rebuild_existing_bitmaps() makes writer.reused reference
* some bitmaps in bitmap_git, so we can't free the latter.
*/
}
static struct ewah_bitmap *find_reused_bitmap(const unsigned char *sha1)