Fix merge

Author: shana

src/GitHub.Api/Installer/GitInstaller.cs

@@ -69,8 +69,8 @@ public ITask<NPath> SetupGitIfNeeded()
         private GitInstallationState VerifyGitInstallation()
         {
             var state = new GitInstallationState();
-            state.GitExists = installDetails.GitExecutablePath.FileExists() ?? false;
-            state.GitLfsExists = installDetails.GitLfsExecutablePath.FileExists() ?? false;
+            state.GitExists = installDetails.GitExecutablePath.IsInitialized && installDetails.GitExecutablePath.FileExists();
+            state.GitLfsExists = installDetails.GitLfsExecutablePath.IsInitialized && installDetails.GitLfsExecutablePath.FileExists();
             state.GitZipExists = installDetails.GitZipPath.FileExists();
             state.GitLfsZipExists = installDetails.GitLfsZipPath.FileExists();
 

src/tests/IntegrationTests/BaseIntegrationTest.cs

@@ -57,7 +57,7 @@ class BaseIntegrationTest
         protected TestUtils.SubstituteFactory Factory { get; set; }
         protected static NPath SolutionDirectory => TestContext.CurrentContext.TestDirectory.ToNPath();
 
-        protected void InitializeEnvironment(NPath? repoPath,
+        protected void InitializeEnvironment(NPath repoPath,
             NPath? environmentPath = null,
             bool enableEnvironmentTrace = false,
             bool initializeRepository = true
@@ -80,7 +80,7 @@ protected void InitializeEnvironment(NPath? repoPath,
                 initializeRepository);
         }
 
-        private void InitializePlatform(NPath repoPath, NPath environmentPath, bool enableEnvironmentTrace,
+        private void InitializePlatform(NPath repoPath, NPath? environmentPath, bool enableEnvironmentTrace,
             bool setupGit = true, string testName = "")
         {
             InitializeTaskManager();
@@ -103,7 +103,7 @@ protected void InitializeTaskManager()
         }
 
         protected IEnvironment InitializePlatformAndEnvironment(NPath repoPath,
-            NPath environmentPath = null,
+            NPath? environmentPath = null,
             bool enableEnvironmentTrace = false,
             bool setupGit = true,
             Action<IRepositoryManager> onRepositoryManagerCreated = null,
@@ -154,7 +154,7 @@ protected void SetupGit(NPath pathToSetupGitInto, string testName)
 
             var gitInstaller = new GitInstaller(Environment, TaskManager.Token, installDetails);
 
-            NPath result = null;
+            NPath? result = null;
             Exception ex = null;
 
             var setupTask = gitInstaller.SetupGitIfNeeded();
@@ -177,7 +177,7 @@ protected void SetupGit(NPath pathToSetupGitInto, string testName)
                 throw new Exception("Did not install git");
             }
 
-            Environment.GitExecutablePath = result;
+            Environment.GitExecutablePath = result.Value;
             GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
         }
 

src/tests/IntegrationTests/IntegrationTestEnvironment.cs

@@ -38,7 +38,7 @@ public IntegrationTestEnvironment(ICacheContainer cacheContainer,
 
             Initialize(UnityVersion, installPath, solutionDirectory, repoPath.Combine("Assets"));
 
-            InitializeRepository(initializeRepository ? repoPath : null);
+            InitializeRepository(initializeRepository ? (NPath?)repoPath : null);
 
             this.enableTrace = enableTrace;