update-repo: Updated to work correctly when a file in the current path has the same short-name as a repo