@@ -279,6 +279,7 @@ describe('Config', () => {
279279 } ,
280280 commit : {
281281 addTag : true ,
282+ commitFixup : true ,
282283 createBranch : true ,
283284 checkout : true ,
284285 cherrypick : true ,
@@ -362,6 +363,7 @@ describe('Config', () => {
362363 } ,
363364 commit : {
364365 addTag : true ,
366+ commitFixup : true ,
365367 createBranch : true ,
366368 checkout : true ,
367369 cherrypick : true ,
@@ -463,6 +465,7 @@ describe('Config', () => {
463465 } ,
464466 commit : {
465467 addTag : true ,
468+ commitFixup : true ,
466469 createBranch : true ,
467470 checkout : false ,
468471 cherrypick : true ,
@@ -866,6 +869,7 @@ describe('Config', () => {
866869 'dialog.pullBranch.squashCommits' ,
867870 'dialog.rebase.ignoreDate' ,
868871 'dialog.rebase.launchInteractiveRebase' ,
872+ 'dialog.rebase.autosquash' ,
869873 'dialog.stashUncommittedChanges.includeUntracked'
870874 ] . forEach ( ( section ) => vscode . mockExtensionSettingReturnValue ( section , true ) ) ;
871875
@@ -936,6 +940,7 @@ describe('Config', () => {
936940 squash : true
937941 } ,
938942 rebase : {
943+ autosquash : true ,
939944 ignoreDate : true ,
940945 interactive : true
941946 } ,
@@ -971,6 +976,8 @@ describe('Config', () => {
971976 'dialog.pullBranch.squashCommits' ,
972977 'dialog.rebase.ignoreDate' ,
973978 'dialog.rebase.launchInteractiveRebase' ,
979+ 'dialog.rebase.autosquash' ,
980+ 'dialog.rebase.autosquash' ,
974981 'dialog.stashUncommittedChanges.includeUntracked'
975982 ] . forEach ( ( section ) => vscode . mockExtensionSettingReturnValue ( section , false ) ) ;
976983
@@ -1041,6 +1048,7 @@ describe('Config', () => {
10411048 squash : false
10421049 } ,
10431050 rebase : {
1051+ autosquash : false ,
10441052 ignoreDate : false ,
10451053 interactive : false
10461054 } ,
@@ -1076,6 +1084,7 @@ describe('Config', () => {
10761084 'dialog.pullBranch.squashCommits' ,
10771085 'dialog.rebase.ignoreDate' ,
10781086 'dialog.rebase.launchInteractiveRebase' ,
1087+ 'dialog.rebase.autosquash' ,
10791088 'dialog.stashUncommittedChanges.includeUntracked'
10801089 ] . forEach ( ( section ) => vscode . mockExtensionSettingReturnValue ( section , 1 ) ) ;
10811090
@@ -1146,6 +1155,7 @@ describe('Config', () => {
11461155 squash : true
11471156 } ,
11481157 rebase : {
1158+ autosquash : true ,
11491159 ignoreDate : true ,
11501160 interactive : true
11511161 } ,
@@ -1181,6 +1191,7 @@ describe('Config', () => {
11811191 'dialog.pullBranch.squashCommits' ,
11821192 'dialog.rebase.ignoreDate' ,
11831193 'dialog.rebase.launchInteractiveRebase' ,
1194+ 'dialog.rebase.autosquash' ,
11841195 'dialog.stashUncommittedChanges.includeUntracked'
11851196 ] . forEach ( ( section ) => vscode . mockExtensionSettingReturnValue ( section , 0 ) ) ;
11861197
@@ -1251,6 +1262,7 @@ describe('Config', () => {
12511262 squash : false
12521263 } ,
12531264 rebase : {
1265+ autosquash : false ,
12541266 ignoreDate : false ,
12551267 interactive : false
12561268 } ,
@@ -1341,6 +1353,7 @@ describe('Config', () => {
13411353 squash : false
13421354 } ,
13431355 rebase : {
1356+ autosquash : false ,
13441357 ignoreDate : true ,
13451358 interactive : false
13461359 } ,
@@ -1424,6 +1437,7 @@ describe('Config', () => {
14241437 squash : false
14251438 } ,
14261439 rebase : {
1440+ autosquash : false ,
14271441 ignoreDate : true ,
14281442 interactive : false
14291443 } ,
0 commit comments