From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Aug 2021 19:36:17 +0000 (-0700)
Subject: Merge branch 'cb/many-alternate-optim-fixup'
X-Git-Tag: v2.33.0-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7cfaa86fe6f61698752d13c59ac97a102d1fbaae;p=thirdparty%2Fgit.git

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
---

7cfaa86fe6f61698752d13c59ac97a102d1fbaae