Skip to content

Commit a10f9e0

Browse files
committed
enhance: popup will be closed when cherry-pick or revert failed
1 parent 0dd6692 commit a10f9e0

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/ViewModels/CherryPick.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ public override Task<bool> Sure()
7272

7373
return Task.Run(() =>
7474
{
75-
var succ = false;
7675
if (IsMergeCommit)
7776
{
78-
succ = new Commands.CherryPick(
77+
new Commands.CherryPick(
7978
_repo.FullPath,
8079
Targets[0].SHA,
8180
!AutoCommit,
@@ -84,7 +83,7 @@ public override Task<bool> Sure()
8483
}
8584
else
8685
{
87-
succ = new Commands.CherryPick(
86+
new Commands.CherryPick(
8887
_repo.FullPath,
8988
string.Join(' ', Targets.ConvertAll(c => c.SHA)),
9089
!AutoCommit,
@@ -93,7 +92,7 @@ public override Task<bool> Sure()
9392
}
9493

9594
CallUIThread(() => _repo.SetWatcherEnabled(true));
96-
return succ;
95+
return true;
9796
});
9897
}
9998

src/ViewModels/Revert.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public override Task<bool> Sure()
3131

3232
return Task.Run(() =>
3333
{
34-
var succ = new Commands.Revert(_repo.FullPath, Target.SHA, AutoCommit).Exec();
34+
new Commands.Revert(_repo.FullPath, Target.SHA, AutoCommit).Exec();
3535
CallUIThread(() => _repo.SetWatcherEnabled(true));
36-
return succ;
36+
return true;
3737
});
3838
}
3939

0 commit comments

Comments
 (0)