Sometimes git is nasty