Merge branch 'jk/pack-objects-with-bitmap-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:58 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:58 +0000 (13:53 -0700)
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

1  2 
pack-bitmap.c
t/t5310-pack-bitmaps.sh
diff --cc pack-bitmap.c
index c7d593c91c7a76497407a703d9f0c50925e2475a,40debd5e202e7fc0cc3aaa5eb01ecde62010c748..5848cc93aa254b8549f4c569882b5d781984ca47
@@@ -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;
        }
Simple merge