get rid of some(?) of the 'bare and worktree don't make sense' errors