File tree Expand file tree Collapse file tree 1 file changed +13
-2
lines changed
Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -362,8 +362,19 @@ private void UpdateItems()
362362 continue ;
363363 }
364364
365- if ( item . Action == Models . InteractiveRebaseAction . Fixup ||
366- item . Action == Models . InteractiveRebaseAction . Squash )
365+ if ( item . Action == Models . InteractiveRebaseAction . Fixup )
366+ {
367+ item . IsFullMessageUsed = false ;
368+ item . ShowEditMessageButton = false ;
369+ item . PendingType = hasPending ? Models . InteractiveRebasePendingType . Pending : Models . InteractiveRebasePendingType . Last ;
370+ item . FullMessage = item . OriginalFullMessage ;
371+ item . IsMessageUserEdited = false ;
372+
373+ hasPending = true ;
374+ continue ;
375+ }
376+
377+ if ( item . Action == Models . InteractiveRebaseAction . Squash )
367378 {
368379 item . IsFullMessageUsed = false ;
369380 item . ShowEditMessageButton = false ;
You can’t perform that action at this time.
0 commit comments