From: Junio C Hamano Date: Fri, 8 May 2020 21:25:09 +0000 (-0700) Subject: Merge branch 'cb/avoid-colliding-with-netbsd-hmac' X-Git-Tag: v2.27.0-rc0~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9bcd76a9a5373fe12f48490355d1a2021c0583f;p=thirdparty%2Fgit.git Merge branch 'cb/avoid-colliding-with-netbsd-hmac' The header on NetBSD brings in its own definition of hmac() function (eek), which conflicts with our own and unrelated function with the same name. Our function has been renamed to work around the issue. * cb/avoid-colliding-with-netbsd-hmac: builtin/receive-pack: avoid generic function name hmac() --- b9bcd76a9a5373fe12f48490355d1a2021c0583f