Change the way we search for git-lfs if there's a custom git path

If there's a custom git path but not a custom git-lfs path, assume
that git-lfs is in the directory where we would extract if from the
bundle and look there directly instead of going recursively in the
file system, it's most likely there.

Author: shana

src/GitHub.Api/Installer/GitInstaller.cs

@@ -67,23 +67,16 @@ public GitInstallationState VerifyGitSettings(GitInstallationState state = null)
             if (state.GitIsValid)
                 state.GitInstallationPath = state.GitExecutablePath.Parent.Parent;
 
-            var isDefaultGitLfs = !state.GitLfsExecutablePath.IsInitialized;
-            if (isDefaultGitLfs)
+            if (!state.GitLfsExecutablePath.IsInitialized)
             {
-                state.GitLfsExecutablePath = ProcessManager.FindExecutableInPath(installDetails.GitLfsExecutable, false, state.GitExecutablePath.Parent);
-                if (!state.GitLfsExecutablePath.IsInitialized)
-                    state.GitLfsExecutablePath = ProcessManager.FindExecutableInPath(installDetails.GitLfsExecutable, true, state.GitInstallationPath);
+                // look for it in the directory where we would install it from the bundle
+                state.GitLfsExecutablePath = installDetails.GitLfsExecutablePath;
             }
 
             state = ValidateGitLfsVersion(state);
 
             if (state.GitLfsIsValid)
-            {
-                if (isDefaultGitLfs)
-                    state.GitLfsInstallationPath = state.GitInstallationPath;
-                else
-                    state.GitLfsInstallationPath = state.GitLfsExecutablePath.Parent;
-            }
+                state.GitLfsInstallationPath = state.GitLfsExecutablePath.Parent;
 
             return state;
         }
@@ -111,7 +104,7 @@ public GitInstallationState FindSystemGit(GitInstallationState state)
                 state.GitLfsExecutablePath = gitLfsPath;
                 state = ValidateGitLfsVersion(state);
                 if (state.GitLfsIsValid)
-                    state.GitLfsInstallationPath = gitLfsPath.Parent;
+                    state.GitLfsInstallationPath = state.GitLfsExecutablePath.Parent;
             }
             return state;
         }
@@ -128,10 +121,7 @@ public GitInstallationState SetDefaultPaths(GitInstallationState state)
             if (!state.GitLfsIsValid)
             {
                 state.GitLfsExecutablePath = installDetails.GitLfsExecutablePath;
-                if (state.GitIsValid && state.GitInstallationPath != installDetails.GitInstallationPath)
-                    state.GitLfsInstallationPath = state.GitLfsExecutablePath.Parent;
-                else
-                    state.GitLfsInstallationPath = installDetails.GitInstallationPath;
+                state.GitLfsInstallationPath = state.GitLfsExecutablePath.Parent;
                 state = ValidateGitLfsVersion(state);
             }
             return state;

src/GitHub.Api/Platform/ProcessEnvironment.cs

@@ -37,6 +37,7 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
             var pathEntries = new List<string>();
             string separator = Environment.IsWindows ? ";" : ":";
 
+            NPath libexecPath = NPath.Default;
             if (Environment.GitInstallPath.IsInitialized)
             {
                 var gitPathRoot = Environment.GitExecutablePath.Resolve().Parent.Parent;
@@ -53,9 +54,9 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
                     binPath = baseExecPath.Combine("bin");
                 }
 
-                var execPath = baseExecPath.Combine("libexec", "git-core");
-                if (!execPath.DirectoryExists())
-                    execPath = NPath.Default;
+                libexecPath = baseExecPath.Combine("libexec", "git-core");
+                if (!libexecPath.DirectoryExists())
+                    libexecPath = NPath.Default;
 
                 if (Environment.IsWindows)
                 {
@@ -66,17 +67,17 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
                     pathEntries.Add(gitExecutableDir.ToString());
                 }
 
-                if (execPath.IsInitialized)
-                    pathEntries.Add(execPath);
+                if (libexecPath.IsInitialized)
+                    pathEntries.Add(libexecPath);
                 pathEntries.Add(binPath);
 
                 // we can only set this env var if there is a libexec/git-core. git will bypass internally bundled tools if this env var
                 // is set, which will break Apple's system git on certain tools (like osx-credentialmanager)
-                if (execPath.IsInitialized)
-                    psi.EnvironmentVariables["GIT_EXEC_PATH"] = execPath.ToString();
+                if (libexecPath.IsInitialized)
+                    psi.EnvironmentVariables["GIT_EXEC_PATH"] = libexecPath.ToString();
             }
 
-            if (Environment.GitLfsInstallPath.IsInitialized && Environment.GitInstallPath != Environment.GitLfsInstallPath)
+            if (Environment.GitLfsInstallPath.IsInitialized && libexecPath != Environment.GitLfsInstallPath)
             {
                 pathEntries.Add(Environment.GitLfsInstallPath);
             }