Skip to content

Commit cfa7e0e

Browse files
committed
fix: editing commit message button should be available for Fixup action in Interactive Rebase window
Signed-off-by: leo <longshuang@msn.cn>
1 parent e67c87c commit cfa7e0e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/ViewModels/InteractiveRebase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ private void UpdateItems()
347347
item.FullMessage = item.OriginalFullMessage;
348348

349349
item.CanReword = !hasPendingTarget;
350-
item.ShowEditMessageButton = item.CanReword && (item.Action == Models.InteractiveRebaseAction.Squash || item.Action == Models.InteractiveRebaseAction.Reword);
350+
item.ShowEditMessageButton = item.CanReword &&
351+
(item.Action == Models.InteractiveRebaseAction.Reword || item.Action == Models.InteractiveRebaseAction.Squash || item.Action == Models.InteractiveRebaseAction.Fixup);
351352

352353
if (item.Action != Models.InteractiveRebaseAction.Drop)
353354
hasPendingTarget = item.Action == Models.InteractiveRebaseAction.Squash || item.Action == Models.InteractiveRebaseAction.Fixup;

0 commit comments

Comments
 (0)