Wrestling with a borked git