gpo: Update for git 1.8.5.2. Increase robustness.