]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/prune-with-bitmap-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:38 +0000 (12:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:38 +0000 (12:47 +0900)
When the reachability bitmap is in effect, the "do not lose
recently created objects and those that are reachable from them"
safety to protect us from races were disabled by mistake, which has
been corrected.

* jk/prune-with-bitmap-fix:
  prune: save reachable-from-recent objects with bitmaps
  pack-bitmap: clean up include_check after use

1  2 
pack-bitmap.c

diff --cc pack-bitmap.c
Simple merge