Backport git2 update #10442 as 0.61.1

This is a version bump and backport of the git2 updates in #10442 to the `rust-1.60.0` branch.

Closes #10446