Skip to content

Commit a9bb173

Browse files
committed
enhance: leave action to pick if there's only fixup and drop commits to it (#2313)
Signed-off-by: leo <longshuang@msn.cn>
1 parent 5fbfe97 commit a9bb173

1 file changed

Lines changed: 18 additions & 9 deletions

File tree

‎src/ViewModels/InteractiveRebase.cs‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -465,15 +465,24 @@ private void UpdateItems()
465465

466466
if (hasPending)
467467
{
468-
var builder = new StringBuilder();
469-
builder.Append(item.OriginalFullMessage);
470-
for (var j = pendingMessages.Count - 1; j >= 0; j--)
471-
builder.Append("\n").Append(pendingMessages[j]);
472-
473-
item.Action = Models.InteractiveRebaseAction.Reword;
474-
item.PendingType = Models.InteractiveRebasePendingType.Target;
475-
item.ShowEditMessageButton = true;
476-
item.FullMessage = builder.ToString();
468+
if (pendingMessages.Count > 0)
469+
{
470+
var builder = new StringBuilder();
471+
builder.Append(item.OriginalFullMessage);
472+
for (var j = pendingMessages.Count - 1; j >= 0; j--)
473+
builder.Append("\n").Append(pendingMessages[j]);
474+
475+
item.Action = Models.InteractiveRebaseAction.Reword;
476+
item.PendingType = Models.InteractiveRebasePendingType.Target;
477+
item.ShowEditMessageButton = true;
478+
item.FullMessage = builder.ToString();
479+
}
480+
else
481+
{
482+
item.PendingType = Models.InteractiveRebasePendingType.Target;
483+
item.ShowEditMessageButton = false;
484+
item.FullMessage = item.OriginalFullMessage;
485+
}
477486

478487
hasPending = false;
479488
pendingMessages.Clear();

0 commit comments

Comments
 (0)