@@ -226,59 +226,61 @@ private void ValidateAndSetGitInstallPath(string value)
226
226
227
227
gitVersionErrorMessage = null ;
228
228
229
- GitClient . ValidateGitInstall ( value ) . ThenInUI ( ( sucess , result ) => {
230
- if ( ! sucess )
229
+ GitClient . ValidateGitInstall ( value . ToNPath ( ) )
230
+ . ThenInUI ( ( sucess , result ) =>
231
231
{
232
- Logger . Trace ( ErrorGettingSoftwareVersionMessage ) ;
233
- gitVersionErrorMessage = ErrorGettingSoftwareVersionMessage ;
234
-
235
- isBusy = false ;
236
-
237
- return ;
238
- }
239
-
240
- if ( ! result . IsValid )
241
- {
242
- Logger . Warning ( "Software versions do not meet minimums Git:{0} (Minimum:{1}) GitLfs:{2} (Minimum:{3})" ,
243
- result . GitVersion ,
244
- Constants . MinimumGitVersion ,
245
- result . GitLfsVersion ,
246
- Constants . MinimumGitLfsVersion ) ;
232
+ if ( ! sucess )
233
+ {
234
+ Logger . Trace ( ErrorGettingSoftwareVersionMessage ) ;
235
+ gitVersionErrorMessage = ErrorGettingSoftwareVersionMessage ;
247
236
248
- var errorMessageStringBuilder = new StringBuilder ( ) ;
237
+ isBusy = false ;
249
238
250
- if ( result . GitVersion < Constants . MinimumGitVersion )
251
- {
252
- errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitVersionMessageFormat , result . GitVersion , Constants . MinimumGitVersion ) ;
239
+ return ;
253
240
}
254
241
255
- if ( result . GitLfsVersion < Constants . MinimumGitLfsVersion )
242
+ if ( ! result . IsValid )
256
243
{
257
- if ( errorMessageStringBuilder . Length > 0 )
244
+ Logger . Warning ( "Software versions do not meet minimums Git:{0} (Minimum:{1}) GitLfs:{2} (Minimum:{3})" ,
245
+ result . GitVersion ,
246
+ Constants . MinimumGitVersion ,
247
+ result . GitLfsVersion ,
248
+ Constants . MinimumGitLfsVersion ) ;
249
+
250
+ var errorMessageStringBuilder = new StringBuilder ( ) ;
251
+
252
+ if ( result . GitVersion < Constants . MinimumGitVersion )
258
253
{
259
- errorMessageStringBuilder . Append ( Environment . NewLine ) ;
254
+ errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitVersionMessageFormat , result . GitVersion , Constants . MinimumGitVersion ) ;
260
255
}
261
256
262
- errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitLfsVersionMessageFormat , result . GitLfsVersion , Constants . MinimumGitLfsVersion ) ;
263
- }
257
+ if ( result . GitLfsVersion < Constants . MinimumGitLfsVersion )
258
+ {
259
+ if ( errorMessageStringBuilder . Length > 0 )
260
+ {
261
+ errorMessageStringBuilder . Append ( Environment . NewLine ) ;
262
+ }
264
263
265
- gitVersionErrorMessage = errorMessageStringBuilder . ToString ( ) ;
264
+ errorMessageStringBuilder . AppendFormat ( ErrorMinimumGitLfsVersionMessageFormat , result . GitLfsVersion , Constants . MinimumGitLfsVersion ) ;
265
+ }
266
266
267
- isBusy = false ;
268
- return ;
269
- }
267
+ gitVersionErrorMessage = errorMessageStringBuilder . ToString ( ) ;
270
268
271
- Logger . Trace ( "Software versions meet minimums Git:{0} GitLfs:{1}" ,
272
- result . GitVersion ,
273
- result . GitLfsVersion ) ;
269
+ isBusy = false ;
270
+ return ;
271
+ }
274
272
275
- Manager . SystemSettings . Set ( Constants . GitInstallPathKey , value ) ;
276
- Environment . GitExecutablePath = value . ToNPath ( ) ;
273
+ Logger . Trace ( "Software versions meet minimums Git:{0} GitLfs:{1}" ,
274
+ result . GitVersion ,
275
+ result . GitLfsVersion ) ;
277
276
278
- gitExecHasChanged = true ;
279
- isBusy = false ;
277
+ Manager . SystemSettings . Set ( Constants . GitInstallPathKey , value ) ;
278
+ Environment . GitExecutablePath = value . ToNPath ( ) ;
279
+
280
+ gitExecHasChanged = true ;
281
+ isBusy = false ;
280
282
281
- } ) . Start ( ) ;
283
+ } ) . Start ( ) ;
282
284
}
283
285
}
284
286
}
0 commit comments