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

Commit 50e1588

Browse files
Simplifying method by removing exit points
1 parent ea74e08 commit 50e1588

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

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

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,25 +220,20 @@ private void ValidateAndSetGitInstallPath(string value)
220220
{
221221
Logger.Trace(ErrorGettingSoftwareVersionMessage);
222222
gitVersionErrorMessage = ErrorGettingSoftwareVersionMessage;
223-
224-
isBusy = false;
225-
226-
return;
227223
}
228-
229-
if (!result.IsValid)
224+
else if (!result.IsValid)
230225
{
231-
Logger.Warning("Software versions do not meet minimums Git:{0} (Minimum:{1}) GitLfs:{2} (Minimum:{3})",
232-
result.GitVersion,
233-
Constants.MinimumGitVersion,
234-
result.GitLfsVersion,
226+
Logger.Warning(
227+
"Software versions do not meet minimums Git:{0} (Minimum:{1}) GitLfs:{2} (Minimum:{3})",
228+
result.GitVersion, Constants.MinimumGitVersion, result.GitLfsVersion,
235229
Constants.MinimumGitLfsVersion);
236230

237231
var errorMessageStringBuilder = new StringBuilder();
238232

239233
if (result.GitVersion < Constants.MinimumGitVersion)
240234
{
241-
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitVersionMessageFormat, result.GitVersion, Constants.MinimumGitVersion);
235+
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitVersionMessageFormat,
236+
result.GitVersion, Constants.MinimumGitVersion);
242237
}
243238

244239
if (result.GitLfsVersion < Constants.MinimumGitLfsVersion)
@@ -248,23 +243,24 @@ private void ValidateAndSetGitInstallPath(string value)
248243
errorMessageStringBuilder.Append(Environment.NewLine);
249244
}
250245

251-
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitLfsVersionMessageFormat, result.GitLfsVersion, Constants.MinimumGitLfsVersion);
246+
errorMessageStringBuilder.AppendFormat(ErrorMinimumGitLfsVersionMessageFormat,
247+
result.GitLfsVersion, Constants.MinimumGitLfsVersion);
252248
}
253249

254250
gitVersionErrorMessage = errorMessageStringBuilder.ToString();
255-
256-
isBusy = false;
257-
return;
258251
}
252+
else
253+
{
254+
Logger.Trace("Software versions meet minimums Git:{0} GitLfs:{1}",
255+
result.GitVersion,
256+
result.GitLfsVersion);
259257

260-
Logger.Trace("Software versions meet minimums Git:{0} GitLfs:{1}",
261-
result.GitVersion,
262-
result.GitLfsVersion);
258+
Manager.SystemSettings.Set(Constants.GitInstallPathKey, value);
259+
Environment.GitExecutablePath = value.ToNPath();
263260

264-
Manager.SystemSettings.Set(Constants.GitInstallPathKey, value);
265-
Environment.GitExecutablePath = value.ToNPath();
261+
gitExecHasChanged = true;
262+
}
266263

267-
gitExecHasChanged = true;
268264
isBusy = false;
269265

270266
}).Start();

0 commit comments

Comments
 (0)