@@ -128,16 +128,16 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
128
128
protected override void OnClosing ( WindowClosingEventArgs e )
129
129
{
130
130
var config = new Commands . Config ( null ) . ListAll ( ) ;
131
- SetIfChanged ( config , "user.name" , DefaultUser ) ;
132
- SetIfChanged ( config , "user.email" , DefaultEmail ) ;
133
- SetIfChanged ( config , "user.signingkey" , GPGUserKey ) ;
134
- SetIfChanged ( config , "core.autocrlf" , CRLFMode != null ? CRLFMode . Value : null ) ;
135
- SetIfChanged ( config , "commit.gpgsign" , EnableGPGCommitSigning ? "true" : "false" ) ;
136
- SetIfChanged ( config , "tag.gpgsign" , EnableGPGTagSigning ? "true" : "false" ) ;
137
- SetIfChanged ( config , "gpg.format" , GPGFormat . Value ) ;
131
+ SetIfChanged ( config , "user.name" , DefaultUser , "" ) ;
132
+ SetIfChanged ( config , "user.email" , DefaultEmail , "" ) ;
133
+ SetIfChanged ( config , "user.signingkey" , GPGUserKey , "" ) ;
134
+ SetIfChanged ( config , "core.autocrlf" , CRLFMode != null ? CRLFMode . Value : null , null ) ;
135
+ SetIfChanged ( config , "commit.gpgsign" , EnableGPGCommitSigning ? "true" : "false" , "false" ) ;
136
+ SetIfChanged ( config , "tag.gpgsign" , EnableGPGTagSigning ? "true" : "false" , "false" ) ;
137
+ SetIfChanged ( config , "gpg.format" , GPGFormat . Value , "opengpg" ) ;
138
138
139
139
if ( ! GPGFormat . Value . Equals ( "ssh" , StringComparison . Ordinal ) )
140
- SetIfChanged ( config , $ "gpg.{ GPGFormat . Value } .program", GPGExecutableFile ) ;
140
+ SetIfChanged ( config , $ "gpg.{ GPGFormat . Value } .program", GPGExecutableFile , "" ) ;
141
141
142
142
base . OnClosing ( e ) ;
143
143
}
@@ -244,12 +244,12 @@ private async void SelectExternalMergeTool(object _1, RoutedEventArgs _2)
244
244
}
245
245
}
246
246
247
- private void SetIfChanged ( Dictionary < string , string > cached , string key , string value )
247
+ private void SetIfChanged ( Dictionary < string , string > cached , string key , string value , string defValue )
248
248
{
249
249
bool changed = false ;
250
250
if ( cached . TryGetValue ( key , out var old ) )
251
251
changed = old != value ;
252
- else if ( ! string . IsNullOrEmpty ( value ) )
252
+ else if ( ! string . IsNullOrEmpty ( value ) && value != defValue )
253
253
changed = true ;
254
254
255
255
if ( changed )
0 commit comments