Better handling of .git suffixes