Merge branch 'master' into fixes/lock-status-updates

Author: StanleyGoldman

src/GitHub.Api/Git/GitClient.cs

@@ -103,17 +103,30 @@ public async Task<NPath> FindGitInstallation()
             if (!String.IsNullOrEmpty(environment.GitExecutablePath))
                 return environment.GitExecutablePath;
 
-            var path = await LookForPortableGit();
+            NPath path = null;
+
+            if (environment.IsWindows)
+                path = await LookForPortableGit();
+
             if (path == null)
                 path = await LookForSystemGit();
 
-            Logger.Trace("Git Installation folder {0} discovered: '{1}'", path == null ? "not" : "", path);
+            if (path == null)
+            {
+                Logger.Trace("Git Installation not discovered");
+            }
+            else
+            {
+                Logger.Trace("Git Installation discovered: '{0}'", path);
+            }
 
             return path;
         }
 
         private Task<NPath> LookForPortableGit()
         {
+            Logger.Trace("LookForPortableGit");
+
             var gitHubLocalAppDataPath = environment.UserCachePath;
             if (!gitHubLocalAppDataPath.DirectoryExists())
                 return null;
@@ -134,16 +147,22 @@ private Task<NPath> LookForPortableGit()
 
         private async Task<NPath> LookForSystemGit()
         {
+            Logger.Trace("LookForSystemGit");
+
             NPath path = null;
             if (!environment.IsWindows)
             {
                 var p = new NPath("/usr/local/bin/git");
+
                 if (p.FileExists())
                     path = p;
             }
 
             if (path == null)
-                path = await new FindExecTask("git", taskManager.Token).StartAwait();
+            {
+                path = await new FindExecTask("git", taskManager.Token)
+                    .Configure(processManager).StartAwait();
+            }
 
             return path;
         }

src/GitHub.Api/OutputProcessors/ProcessManager.cs

@@ -24,15 +24,28 @@ public ProcessManager(IEnvironment environment, IProcessEnvironment gitEnvironme
 
         public T Configure<T>(T processTask, bool withInput = false) where T : IProcess
         {
+            NPath executableFileName;
+            if (processTask.ProcessName != null)
+            {
+                executableFileName = processTask.ProcessName.ToNPath();
+                //logger.Trace("Configuring Task:{0} with Exec:{1}", processTask.GetType().Name, executableFileName);
+            }
+            else
+            {
+                executableFileName = environment.GitExecutablePath;
+                //logger.Trace("Configuring Task:{0} with Git", processTask.GetType().Name);
+            }
+
             return Configure(processTask,
-                processTask.ProcessName?.ToNPath() ?? environment.GitExecutablePath,
+                executableFileName,
                 processTask.ProcessArguments,
                 environment.RepositoryPath, withInput);
         }
 
         public T Configure<T>(T processTask, string executableFileName, string arguments, NPath workingDirectory = null, bool withInput = false)
              where T : IProcess
         {
+            //If this null check fails, be sure you called Configure() on your task
             Guard.ArgumentNotNull(executableFileName, nameof(executableFileName));
 
             var startInfo = new ProcessStartInfo

src/GitHub.Api/Platform/FindExecTask.cs

@@ -13,6 +13,7 @@ public FindExecTask(string executable, CancellationToken token)
             arguments = executable;
         }
 
+        public override string ProcessName { get { return Name; } }
         public override string ProcessArguments { get { return arguments; } }
         public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } }
     }