Backport of "git: Fix issue with last security patch" into 1.20
Backport of !923 (merged) "git: Fix issue with last security patch".
Todo:
-
Needs manual intervention, cherry-picking failed!
Commits:
- f4997a83 git: Fix issue with last security patch
Edited by Nirbheek Chauhan