Attempting to not change the PATH variable when validating git

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using System.Diagnostics.Eventing.Reader;
 using GitHub.Logging;
 
 namespace GitHub.Unity
@@ -55,8 +53,8 @@ public void Run(bool firstRun)
         {
             Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
 
-            var initEnvironmentTask = new ActionTask<object[]>(CancellationToken,
-                    (_, values) => InitializeEnvironment((NPath)values[0], (bool)values[1]))
+            var initEnvironmentTask = new ActionTask<NPath>(CancellationToken,
+                    (_, path) => InitializeEnvironment(path))
                 { Affinity = TaskAffinity.UI };
 
             isBusy = true;
@@ -89,7 +87,6 @@ public void Run(bool firstRun)
                     if (path.IsInitialized)
                     {
                         t.GetEndOfChain()
-                            .Then(b => new object[] {path, true})
                             .Then(initEnvironmentTask, taskIsTopOfChain: true);
                         return;
                     }
@@ -102,7 +99,6 @@ public void Run(bool firstRun)
                     task.OnEnd += (thisTask, result, success, exception) =>
                     {
                         thisTask.GetEndOfChain()
-                            .Then(b => new object[] { result, false })
                             .Then(initEnvironmentTask, taskIsTopOfChain: true);
                     };
 
@@ -209,9 +205,8 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
         /// Initialize environment after finding where git is. This needs to run on the main thread
         /// </summary>
         /// <param name="gitExecutablePath"></param>
-        /// <param name="isCustomGitExec"></param>
         /// <param name="octorunScriptPath"></param>
-        private void InitializeEnvironment(NPath gitExecutablePath, bool isCustomGitExec)
+        private void InitializeEnvironment(NPath gitExecutablePath)
         {
             isBusy = false;
             SetupMetrics();
@@ -220,6 +215,9 @@ private void InitializeEnvironment(NPath gitExecutablePath, bool isCustomGitExec
             {
                 return;
             }
+            
+            var gitInstallDetails = new GitInstaller.GitInstallDetails(Environment.UserCachePath, Environment.IsWindows);
+            var isCustomGitExec = gitExecutablePath != gitInstallDetails.GitExecutablePath;
 
             Environment.GitExecutablePath = gitExecutablePath;
             Environment.IsCustomGitExecutable = isCustomGitExec;

src/GitHub.Api/Git/GitClient.cs

@@ -9,7 +9,7 @@ namespace GitHub.Unity
 {
     public interface IGitClient
     {
-        ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path);
+        ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path, bool isCustomGit);
 
         ITask Init(IOutputProcessor<string> processor = null);
 
@@ -110,7 +110,7 @@ public GitClient(IEnvironment environment, IProcessManager processManager, Cance
             this.cancellationToken = cancellationToken;
         }
 
-        public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
+        public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path, bool isCustomGit)
         {
             if (!path.FileExists())
             {
@@ -126,15 +126,17 @@ public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
                     gitLfsVersion?.CompareTo(Constants.MinimumGitLfsVersion) >= 0,
                     gitVersion, gitLfsVersion));
 
-            var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken).Configure(processManager, path);
+            var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken)
+                .Configure(processManager, path, dontSetupGit: isCustomGit);
 
             gitLfsVersionTask
                 .Then((result, version) => {return gitLfsVersion = version;})
                 .Then(endTask, taskIsTopOfChain: true);
 
             gitLfsVersionTask.Then(endTask, TaskRunOptions.OnFailure, taskIsTopOfChain:true);
 
-            var gitVersionTask = new GitVersionTask(cancellationToken).Configure(processManager, path);
+            var gitVersionTask = new GitVersionTask(cancellationToken)
+                .Configure(processManager, path, dontSetupGit: isCustomGit);
 
             gitVersionTask
                 .Then((result, version) => { return gitVersion = version; })

src/GitHub.Api/OutputProcessors/ProcessManager.cs

@@ -30,6 +30,8 @@ public T Configure<T>(T processTask, NPath? executable = null, string arguments
             bool dontSetupGit = false)
              where T : IProcess
         {
+            logger.Trace("Configure executable:{0}", executable);
+            
             if (executable == null)
             {
                 if (processTask.ProcessName?.ToNPath() != null)
@@ -57,6 +59,7 @@ public T Configure<T>(T processTask, NPath? executable = null, string arguments
                 StandardErrorEncoding = Encoding.UTF8
             };
 
+            logger.Trace("gitEnvironment.Configure dontSetupGit:{0}", dontSetupGit);
             gitEnvironment.Configure(startInfo, workingDirectory ?? environment.RepositoryPath, dontSetupGit);
 
             if (executable.Value.IsRelative)

src/GitHub.Api/Platform/ProcessEnvironment.cs

@@ -21,6 +21,8 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
             psi.EnvironmentVariables["HOME"] = NPath.HomeDirectory;
             psi.EnvironmentVariables["TMP"] = psi.EnvironmentVariables["TEMP"] = NPath.SystemTemp;
             psi.EnvironmentVariables["GHU_WORKINGDIR"] = workingDirectory;
+            
+            Logger.Trace("Configure DontSetupGit:{0}", dontSetupGit);
 
             // if we don't know where git is, then there's nothing else to configure
             if (!Environment.GitInstallPath.IsInitialized || dontSetupGit)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs

@@ -269,7 +269,7 @@ private void ValidateAndSetGitInstallPath(string value)
 
                 gitVersionErrorMessage = null;
 
-                GitClient.ValidateGitInstall(value.ToNPath())
+                GitClient.ValidateGitInstall(value.ToNPath(), true)
                     .FinallyInUI((success, exception, result) =>
                     {
                         if (!success)