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

Commit db379c2

Browse files
Fixes after merge
1 parent 04bbd4c commit db379c2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,26 +185,26 @@ private void ValidateAndSetGitInstallPath(string value)
185185
if (!result.IsValid)
186186
{
187187
Logger.Warning("Software versions do not meet minimums Git:{0} (Minimum:{1}) GitLfs:{2} (Minimum:{3})",
188-
result.GitVersionTask,
188+
result.GitVersion,
189189
Constants.MinimumGitVersion,
190-
result.GitLfsVersionTask,
190+
result.GitLfsVersion,
191191
Constants.MinimumGitLfsVersion);
192192

193193
var errorMessageStringBuilder = new StringBuilder();
194194

195-
if (result.GitVersionTask < Constants.MinimumGitVersion)
195+
if (result.GitVersion < Constants.MinimumGitVersion)
196196
{
197-
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitVersionMessageFormat, result.GitVersionTask, Constants.MinimumGitVersion);
197+
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitVersionMessageFormat, result.GitVersion, Constants.MinimumGitVersion);
198198
}
199199

200-
if (result.GitLfsVersionTask < Constants.MinimumGitLfsVersion)
200+
if (result.GitLfsVersion < Constants.MinimumGitLfsVersion)
201201
{
202202
if(errorMessageStringBuilder.Length > 0)
203203
{
204204
errorMessageStringBuilder.Append(Environment.NewLine);
205205
}
206206

207-
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitLfsVersionMessageFormat, result.GitLfsVersionTask, Constants.MinimumGitLfsVersion);
207+
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitLfsVersionMessageFormat, result.GitLfsVersion, Constants.MinimumGitLfsVersion);
208208
}
209209

210210
gitVersionErrorMessage = errorMessageStringBuilder.ToString();
@@ -214,8 +214,8 @@ private void ValidateAndSetGitInstallPath(string value)
214214
}
215215

216216
Logger.Trace("Software versions meet minimums Git:{0} GitLfs:{1}",
217-
result.GitVersionTask,
218-
result.GitLfsVersionTask);
217+
result.GitVersion,
218+
result.GitLfsVersion);
219219

220220
Manager.SystemSettings.Set(Constants.GitInstallPathKey, value);
221221
Environment.GitExecutablePath = value.ToNPath();

0 commit comments

Comments
 (0)