Merge branch 'ld/osx-keychain-usage-fix' into maint
commit5d2bf34c22df7857c45e49d020bf1b0f4bb0db86
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2022 22:51:37 +0000 (5 15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2022 22:51:37 +0000 (5 15:51 -0700)
tree26ef4d4a01f7fef52d39da07dd21f9b2e72af649
parentef7b9ad032be2f0f06186083f3319c18bc002921
parentf2fc531585215d02a75a4d1ce7e6964e9eb21812
Merge branch 'ld/osx-keychain-usage-fix' into maint

Workaround for a compiler warning against use of die() in
osx-keychain (in contrib/).
source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com>

* ld/osx-keychain-usage-fix:
  osx-keychain: fix compiler warning