@@ -220,25 +220,20 @@ private void ValidateAndSetGitInstallPath(string value)
220
220
{
221
221
Logger . Trace ( ErrorGettingSoftwareVersionMessage ) ;
222
222
gitVersionErrorMessage = ErrorGettingSoftwareVersionMessage ;
223
-
224
- isBusy = false ;
225
-
226
- return ;
227
223
}
228
-
229
- if ( ! result . IsValid )
224
+ else if ( ! result . IsValid )
230
225
{
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 ,
235
229
Constants . MinimumGitLfsVersion ) ;
236
230
237
231
var errorMessageStringBuilder = new StringBuilder ( ) ;
238
232
239
233
if ( result . GitVersion < Constants . MinimumGitVersion )
240
234
{
241
- errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitVersionMessageFormat , result . GitVersion , Constants . MinimumGitVersion ) ;
235
+ errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitVersionMessageFormat ,
236
+ result . GitVersion , Constants . MinimumGitVersion ) ;
242
237
}
243
238
244
239
if ( result . GitLfsVersion < Constants . MinimumGitLfsVersion )
@@ -248,23 +243,24 @@ private void ValidateAndSetGitInstallPath(string value)
248
243
errorMessageStringBuilder . Append ( Environment . NewLine ) ;
249
244
}
250
245
251
- errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitLfsVersionMessageFormat , result . GitLfsVersion , Constants . MinimumGitLfsVersion ) ;
246
+ errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitLfsVersionMessageFormat ,
247
+ result . GitLfsVersion , Constants . MinimumGitLfsVersion ) ;
252
248
}
253
249
254
250
gitVersionErrorMessage = errorMessageStringBuilder . ToString ( ) ;
255
-
256
- isBusy = false ;
257
- return ;
258
251
}
252
+ else
253
+ {
254
+ Logger . Trace ( "Software versions meet minimums Git:{0} GitLfs:{1}" ,
255
+ result . GitVersion ,
256
+ result . GitLfsVersion ) ;
259
257
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 ( ) ;
263
260
264
- Manager . SystemSettings . Set ( Constants . GitInstallPathKey , value ) ;
265
- Environment . GitExecutablePath = value . ToNPath ( ) ;
261
+ gitExecHasChanged = true ;
262
+ }
266
263
267
- gitExecHasChanged = true ;
268
264
isBusy = false ;
269
265
270
266
} ) . Start ( ) ;
0 commit comments