RepositoryCloneViewModel: Combine if condition.

YuPeiHenry · YuPeiHenry · commit 80198b412a57 · 2019-04-04T22:45:26.000+08:00
- RepositoryCloneViewModel: ValidatePathWarning's condition check for
empty directory can be combined with directory exists check.
diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs b/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs
@@ -238,15 +238,10 @@ string ValidatePathWarning(RepositoryModel repositoryModel, string path)
                     return Resources.DestinationAlreadyExists;
                 }
 
-                if (service.DestinationDirectoryExists(path))
+                if (service.DestinationDirectoryExists(path) && service.DestinationDirectoryEmpty(path))
                 {
                     using (var repository = gitService.GetRepository(path))
                     {
-                        if (service.DestinationDirectoryEmpty(path))
-                        {
-                            return null;
-                        }
-
                         if (repository == null)
                         {
                             return Resources.CantFindARepositoryAtLocalPath;

Original file line number	Diff line number	Diff line change
`@@ -238,15 +238,10 @@ string ValidatePathWarning(RepositoryModel repositoryModel, string path)`
`238`	`238`	`return Resources.DestinationAlreadyExists;`
`239`	`239`	`}`
`240`	`240`
`241`		`- if (service.DestinationDirectoryExists(path))`
	`241`	`+ if (service.DestinationDirectoryExists(path) && service.DestinationDirectoryEmpty(path))`
`242`	`242`	`{`
`243`	`243`	`using (var repository = gitService.GetRepository(path))`
`244`	`244`	`{`
`245`		`- if (service.DestinationDirectoryEmpty(path))`
`246`		`- {`
`247`		`- return null;`
`248`		`- }`
`249`		`-`
`250`	`245`	`if (repository == null)`
`251`	`246`	`{`
`252`	`247`	`return Resources.CantFindARepositoryAtLocalPath;`