Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 1f5d1f0

Browse files
authored
Merge pull request #680 from github-for-unity/fixes/using-system-git-is-borked
Fixes UI unavailable when using the system git
2 parents 7510f0d + 734697c commit 1f5d1f0

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ public void Run(bool firstRun)
9999
{
100100
if (path.IsInitialized)
101101
{
102-
var state = new GitInstaller.GitInstallationState { GitExecutablePath = path };
102+
var state = new GitInstaller.GitInstallationState {
103+
GitExecutablePath = path,
104+
GitIsValid = true
105+
};
103106
endTask.PreviousResult = state;
104107
endTask.Start();
105108
return;

src/GitHub.Api/OutputProcessors/ProcessManager.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,7 @@ public T Configure<T>(T processTask, NPath? executable = null, string arguments
3030
bool dontSetupGit = false)
3131
where T : IProcess
3232
{
33-
if (executable == null)
34-
{
35-
if (processTask.ProcessName?.ToNPath() != null)
36-
{
37-
executable = processTask.ProcessName.ToNPath();
38-
}
39-
else
40-
{
41-
executable = environment.GitExecutablePath;
42-
dontSetupGit = environment.IsCustomGitExecutable;
43-
}
44-
}
33+
executable = executable ?? processTask.ProcessName?.ToNPath() ?? environment.GitExecutablePath;
4534

4635
//If this null check fails, be sure you called Configure() on your task
4736
Guard.ArgumentNotNull(executable, nameof(executable));

0 commit comments

Comments
 (0)