Only open repository when .git directory exists

jcansdale · jcansdale · commit dd94727ec7f1 · 2018-10-11T11:54:49.000+01:00
We don't want to change context when a clone operation has failed.
diff --git a/src/GitHub.Exports/Services/VSServices.cs b/src/GitHub.Exports/Services/VSServices.cs
@@ -78,8 +78,9 @@ public bool TryOpenRepository(string repoPath)
                 return false;
             }
 
-            var repoDir = os.Directory.GetDirectory(repoPath);
-            if (!repoDir.Exists)
+            var gitPath = Path.Combine(repoPath, ".git");
+            var gitDir = os.Directory.GetDirectory(gitPath);
+            if (!gitDir.Exists)
             {
                 return false;
             }
diff --git a/test/GitHub.Exports.UnitTests/VSServicesTests.cs b/test/GitHub.Exports.UnitTests/VSServicesTests.cs
@@ -92,9 +92,10 @@ VSServices CreateVSServices(string repoDir, IOperatingSystem os = null, DTE dte
 
             if (repoDir != null)
             {
+                var gitDir = Path.Combine(repoDir, ".git");
                 var directoryInfo = Substitute.For<IDirectoryInfo>();
                 directoryInfo.Exists.Returns(repoDirExists);
-                os.Directory.GetDirectory(repoDir).Returns(directoryInfo);
+                os.Directory.GetDirectory(gitDir).Returns(directoryInfo);
             }
 
             var provider = Substitute.For<IGitHubServiceProvider>();

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,9 @@ public bool TryOpenRepository(string repoPath)`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
`81`		`- var repoDir = os.Directory.GetDirectory(repoPath);`
`82`		`- if (!repoDir.Exists)`
	`81`	`+ var gitPath = Path.Combine(repoPath, ".git");`
	`82`	`+ var gitDir = os.Directory.GetDirectory(gitPath);`
	`83`	`+ if (!gitDir.Exists)`
`83`	`84`	`{`
`84`	`85`	`return false;`
`85`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,10 @@ VSServices CreateVSServices(string repoDir, IOperatingSystem os = null, DTE dte`
`92`	`92`
`93`	`93`	`if (repoDir != null)`
`94`	`94`	`{`
	`95`	`+ var gitDir = Path.Combine(repoDir, ".git");`
`95`	`96`	`var directoryInfo = Substitute.For<IDirectoryInfo>();`
`96`	`97`	`directoryInfo.Exists.Returns(repoDirExists);`
`97`		`- os.Directory.GetDirectory(repoDir).Returns(directoryInfo);`
	`98`	`+ os.Directory.GetDirectory(gitDir).Returns(directoryInfo);`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`var provider = Substitute.For<IGitHubServiceProvider>();`