From: Jiang Xin <worldhello.net@gmail.com>
Date: Wed, 10 Nov 2021 00:55:14 +0000 (+0800)
Subject: Merge branch 'master' of github.com:git/git
X-Git-Tag: v2.34.0~1^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a6160031b54c2e1174b1f990c7393ef8cb39d3d;p=thirdparty%2Fgit.git

Merge branch 'master' of github.com:git/git

* 'master' of github.com:git/git:
  Git 2.34-rc2
  parse-options.[ch]: revert use of "enum" for parse_options()
  t/lib-git.sh: fix ACL-related permissions failure
  A few fixes before -rc2
  async_die_is_recursing: work around GCC v11.x issue on Fedora
  Document positive variant of commit and merge option "--no-verify"
  pull: honor --no-verify and do not call the commit-msg hook
  http-backend: remove a duplicated code branch
---

3a6160031b54c2e1174b1f990c7393ef8cb39d3d