This issue seems to have gone away in the later git versions, without the requirement of the attached patch.