Tracking when git is custom vs internal

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using System.Diagnostics.Eventing.Reader;
 using GitHub.Logging;
 
 namespace GitHub.Unity
@@ -53,9 +54,9 @@ protected void Initialize()
         public void Run(bool firstRun)
         {
             Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
-
-            var initEnvironmentTask = new ActionTask<NPath>(CancellationToken,
-                    (_, path) => InitializeEnvironment(path))
+            
+            var initEnvironmentTask = new ActionTask<object[]>(CancellationToken,
+                    (_, values) => InitializeEnvironment((NPath)values[0], (bool)values[1]))
                 { Affinity = TaskAffinity.UI };
 
             isBusy = true;
@@ -87,7 +88,9 @@ public void Run(bool firstRun)
                 {
                     if (path.IsInitialized)
                     {
-                        t.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
+                        t.GetEndOfChain()
+                            .Then(b => new object[] {path, true})
+                            .Then(initEnvironmentTask, taskIsTopOfChain: true);
                         return;
                     }
                     Logger.Trace("Using portable git");
@@ -98,7 +101,9 @@ public void Run(bool firstRun)
                     task.Progress(progressReporter.UpdateProgress);
                     task.OnEnd += (thisTask, result, success, exception) =>
                     {
-                        thisTask.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
+                        thisTask.GetEndOfChain()
+                            .Then(b => new object[] { result, false })
+                            .Then(initEnvironmentTask, taskIsTopOfChain: true);
                     };
 
                     // append installer task to top chain
@@ -204,8 +209,9 @@ 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)
+        private void InitializeEnvironment(NPath gitExecutablePath, bool isCustomGitExec)
         {
             isBusy = false;
             SetupMetrics();
@@ -216,6 +222,7 @@ private void InitializeEnvironment(NPath gitExecutablePath)
             }
 
             Environment.GitExecutablePath = gitExecutablePath;
+            Environment.IsCustomGitExecutable = isCustomGitExec;
             Environment.User.Initialize(GitClient);
 
             var afterGitSetup = new ActionTask(CancellationToken, RestartRepository)
@@ -226,7 +233,7 @@ private void InitializeEnvironment(NPath gitExecutablePath)
             {
                 var credHelperTask = GitClient.GetConfig("credential.helper", GitConfigSource.Global);
                 credHelperTask.OnEnd += (thisTask, credentialHelper, success, exception) =>
-                    {
+                    {   
                         if (!success || string.IsNullOrEmpty(credentialHelper))
                         {
                             Logger.Warning("No Windows CredentialHelper found: Setting to wincred");

src/GitHub.Api/OutputProcessors/ProcessManager.cs

@@ -1,5 +1,6 @@
 using GitHub.Logging;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -29,7 +30,18 @@ public T Configure<T>(T processTask, NPath? executable = null, string arguments
             bool dontSetupGit = false)
              where T : IProcess
         {
-            executable = executable ?? processTask.ProcessName?.ToNPath() ?? environment.GitExecutablePath;
+            if (executable == null)
+            {
+                if (processTask.ProcessName?.ToNPath() != null)
+                {
+                    executable = processTask.ProcessName.ToNPath();
+                }
+                else
+                {
+                    executable = environment.GitExecutablePath;
+                    dontSetupGit = environment.IsCustomGitExecutable;
+                }
+            }
 
             //If this null check fails, be sure you called Configure() on your task
             Guard.ArgumentNotNull(executable, nameof(executable));
@@ -85,11 +97,15 @@ public void RunCommandLineWindow(NPath workingDirectory)
                 gitEnvironment.Configure(startInfo, workingDirectory);
 
                 var envVars = startInfo.EnvironmentVariables;
-                var scriptContents = new[] {
+                var scriptContents = new List<string> {
                     $"cd \"{envVars["GHU_WORKINGDIR"]}\"",
-                    $"PATH=\"{envVars["GHU_FULLPATH"]}\" /bin/bash"
                 };
-                environment.FileSystem.WriteAllLines(envVarFile, scriptContents);
+
+                if (!environment.IsCustomGitExecutable) {
+                    scriptContents.Add($"PATH=\"{envVars["GHU_FULLPATH"]}\" /bin/bash");
+                }
+                
+                environment.FileSystem.WriteAllLines(envVarFile, scriptContents.ToArray());
                 Mono.Unix.Native.Syscall.chmod(envVarFile, (Mono.Unix.Native.FilePermissions)493); // -rwxr-xr-x mode (0755)
             }
             else

src/GitHub.Api/Platform/DefaultEnvironment.cs

@@ -147,6 +147,9 @@ public NPath OctorunScriptPath
                 octorunScriptPath = value;
             }
         }
+
+        public bool IsCustomGitExecutable { get; set; }
+
         public NPath GitExecutablePath
         {
             get { return gitExecutablePath; }

src/GitHub.Api/Platform/IEnvironment.cs

@@ -12,6 +12,7 @@ public interface IEnvironment
 
         NPath Path { get; }
         string NewLine { get; }
+        bool IsCustomGitExecutable { get; set; }
         NPath GitExecutablePath { get; set; }
         NPath NodeJsExecutablePath { get; }
         NPath OctorunScriptPath { get; set; }

src/GitHub.Api/Platform/ProcessEnvironment.cs

@@ -20,12 +20,12 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
             psi.WorkingDirectory = workingDirectory;
             psi.EnvironmentVariables["HOME"] = NPath.HomeDirectory;
             psi.EnvironmentVariables["TMP"] = psi.EnvironmentVariables["TEMP"] = NPath.SystemTemp;
+            psi.EnvironmentVariables["GHU_WORKINGDIR"] = workingDirectory;
 
             // if we don't know where git is, then there's nothing else to configure
             if (!Environment.GitInstallPath.IsInitialized || dontSetupGit)
                 return;
 
-
             Guard.ArgumentNotNull(psi, "psi");
 
             // We need to essentially fake up what git-cmd.bat does
@@ -77,7 +77,6 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
 
             psi.EnvironmentVariables["PATH"] = path;
             psi.EnvironmentVariables["GHU_FULLPATH"] = path;
-            psi.EnvironmentVariables["GHU_WORKINGDIR"] = workingDirectory;
 
             psi.EnvironmentVariables["PLINK_PROTOCOL"] = "ssh";
             psi.EnvironmentVariables["TERM"] = "msys";

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

@@ -255,6 +255,7 @@ private void ValidateAndSetGitInstallPath(string value)
                         {
                             Manager.SystemSettings.Unset(Constants.GitInstallPathKey);
                             Environment.GitExecutablePath = result;
+                            Environment.IsCustomGitExecutable = false;
 
                             gitExecHasChanged = true;
                         }
@@ -323,6 +324,7 @@ private void ValidateAndSetGitInstallPath(string value)
 
                             Manager.SystemSettings.Set(Constants.GitInstallPathKey, value);
                             Environment.GitExecutablePath = value.ToNPath();
+                            Environment.IsCustomGitExecutable = true;
 
                             gitExecHasChanged = true;
                         }

src/tests/IntegrationTests/IntegrationTestEnvironment.cs

@@ -88,6 +88,8 @@ public string GetSpecialFolder(Environment.SpecialFolder folder)
         public string NewLine => Environment.NewLine;
         public string UnityVersion => "5.6";
 
+        public bool IsCustomGitExecutable { get; set; }
+
         public NPath GitExecutablePath
         {
             get { return defaultEnvironment.GitExecutablePath; }