From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:58 +0000 (-0700)
Subject: Merge branch 'jk/pack-objects-with-bitmap-fix'
X-Git-Tag: v2.20.0-rc0~235
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b4583001b4387b454b5afffebb8b350fca291393

Merge branch 'jk/pack-objects-with-bitmap-fix'

Hotfix of the base topic.

* jk/pack-objects-with-bitmap-fix:
pack-bitmap: drop "loaded" flag
traverse_bitmap_commit_list(): don't free result
t5310: test delta reuse with bitmaps
bitmap_has_sha1_in_uninteresting(): drop BUG check
---

b4583001b4387b454b5afffebb8b350fca291393
diff --cc pack-bitmap.c
index c7d593c91c,40debd5e20..5848cc93aa
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@@ -336,9 -333,9 +333,9 @@@ static int open_pack_bitmap(struct bitm
  	struct packed_git *p;
  	int ret = -1;
  
- 	assert(!bitmap_git->map && !bitmap_git->loaded);
+ 	assert(!bitmap_git->map);
  
 -	for (p = get_packed_git(the_repository); p; p = p->next) {
 +	for (p = get_all_packs(the_repository); p; p = p->next) {
  		if (open_pack_bitmap_1(bitmap_git, p) == 0)
  			ret = 0;
  	}