]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'cb/many-alternate-optim-fixup'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2021 19:36:17 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2021 19:36:17 +0000 (12:36 -0700)
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

1  2 
object-file.c

diff --cc object-file.c
Simple merge