]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/midx-bitmap-selection-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Oct 2022 21:51:52 +0000 (14:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Oct 2022 21:51:52 +0000 (14:51 -0700)
A bugfix with tracing support in midx codepath

* tb/midx-bitmap-selection-fix:
  pack-bitmap-write.c: instrument number of reused bitmaps
  midx.c: instrument MIDX and bitmap generation with trace2 regions
  midx.c: consider annotated tags during bitmap selection
  midx.c: fix whitespace typo

1  2 
midx.c

diff --cc midx.c
Simple merge