Skip to content

Commit 2ed83c5

Browse files
committed
fix: pre-filled action does not update some attributes of InteractiveRebaseItem
Signed-off-by: leo <longshuang@msn.cn>
1 parent c6b521d commit 2ed83c5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/ViewModels/InteractiveRebase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,12 @@ public bool IsMessageUserEdited
9494
set;
9595
} = false;
9696

97-
public InteractiveRebaseItem(int order, Models.Commit c, string message, bool canSquashOrFixup)
97+
public InteractiveRebaseItem(int order, Models.Commit c, string message)
9898
{
9999
OriginalOrder = order;
100100
Commit = c;
101101
FullMessage = message;
102102
OriginalFullMessage = message;
103-
CanSquashOrFixup = canSquashOrFixup;
104103
}
105104

106105
private Models.InteractiveRebaseAction _action = Models.InteractiveRebaseAction.Pick;
@@ -183,7 +182,7 @@ public InteractiveRebase(Repository repo, Models.Commit on, InteractiveRebasePre
183182
for (var i = 0; i < commits.Count; i++)
184183
{
185184
var c = commits[i];
186-
list.Add(new InteractiveRebaseItem(commits.Count - i, c.Commit, c.Message, i < commits.Count - 1));
185+
list.Add(new InteractiveRebaseItem(commits.Count - i, c.Commit, c.Message));
187186
}
188187

189188
var selected = list.Count > 0 ? list[0] : null;
@@ -200,6 +199,7 @@ public InteractiveRebase(Repository repo, Models.Commit on, InteractiveRebasePre
200199
Dispatcher.UIThread.Post(() =>
201200
{
202201
Items.AddRange(list);
202+
UpdateItems();
203203
PreSelected = selected;
204204
IsLoading = false;
205205
});

0 commit comments

Comments
 (0)