Fix bootstrap for git 1.6.x