Merge pull request #6933 from khyperia/git_dir_sometimes_file

Detect git worktrees correctly
This commit is contained in:
Livar 2017-06-19 14:59:20 -07:00 committed by GitHub
commit 670d8f585d

View file

@ -37,9 +37,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
string directory = AppContext.BaseDirectory;
#endif
while (!Directory.Exists(Path.Combine(directory, ".git")) && directory != null)
while (directory != null)
{
directory = Directory.GetParent(directory).FullName;
var gitDirOrFile = Path.Combine(directory, ".git");
if (Directory.Exists(gitDirOrFile) || File.Exists(gitDirOrFile))
{
break;
}
directory = Directory.GetParent(directory)?.FullName;
}
if (directory == null)