Handle case where owner and repo have same name

Author: jcansdale

src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs

@@ -175,6 +175,7 @@ string GetUpdatedBasePath(string path)
 
             string FindDirWithout(string dir, string match, int levels)
             {
+                string dirWithout = null;
                 for (var i = 0; i < 2; i++)
                 {
                     if (string.IsNullOrEmpty(dir))
@@ -186,11 +187,11 @@ string FindDirWithout(string dir, string match, int levels)
                     dir = System.IO.Path.GetDirectoryName(dir);
                     if (name == match)
                     {
-                        return dir;
+                        dirWithout = dir;
                     }
                 }
 
-                return null;
+                return dirWithout;
             }
         }
 

test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs

@@ -174,6 +174,8 @@ public async Task Repository_Name_Replaces_Last_Part_Of_Non_Base_Path()
             Description = "Base path cleared")]
         [TestCase("c:\\base", "owner1/repo1", "c:\\base\\repo1", "owner2/repo2", "c:\\base\\owner2\\repo2",
             Description = "Owner deleted")]
+        [TestCase("c:\\base", "same/same", "c:\\base\\same\\same", "owner2/repo2", "c:\\base\\owner2\\repo2",
+            Description = "Owner and repo have same name")]
         public async Task User_Edits_Path(string defaultClonePath, string repo1, string userPath, string repo2, string expectPath)
         {
             var target = CreateTarget(defaultClonePath: defaultClonePath);