Merge branch 'cb/many-alternate-optim-fixup'
commit7cfaa86fe6f61698752d13c59ac97a102d1fbaae
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2021 19:36:17 +0000 (11 12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2021 19:36:17 +0000 (11 12:36 -0700)
treece8fbddbbabcf6da2dc90e7259b46978302ad0ef
parent2d755dfac9aadab25c3e025b849252b8c0a61465
parent581a3bb155c157094ca486e3a10c4a9b70c8f650
Merge branch 'cb/many-alternate-optim-fixup'

Build fix.

* cb/many-alternate-optim-fixup:
  object-file: use unsigned arithmetic with bit mask
  object-store: avoid extra ';' from KHASH_INIT
  oidtree: avoid nested struct oidtree_node
object-file.c