dealing with annoying directory renaming in git