Skip to content

Commit 7bed988

Browse files
committed
refactor: do not stash untracked changes while doing checkout/create branch/pull with Stash & Reapply (#2016)
Signed-off-by: leo <[email protected]>
1 parent 4f062c5 commit 7bed988

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/ViewModels/Checkout.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public override async Task<bool> Sure()
5252
{
5353
succ = await new Commands.Stash(_repo.FullPath)
5454
.Use(log)
55-
.PushAsync("CHECKOUT_AUTO_STASH");
55+
.PushAsync("CHECKOUT_AUTO_STASH", false);
5656
if (!succ)
5757
{
5858
log.Complete();

src/ViewModels/CheckoutAndFastForward.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public override async Task<bool> Sure()
5757
{
5858
succ = await new Commands.Stash(_repo.FullPath)
5959
.Use(log)
60-
.PushAsync("CHECKOUT_AND_FASTFORWARD_AUTO_STASH");
60+
.PushAsync("CHECKOUT_AND_FASTFORWARD_AUTO_STASH", false);
6161
if (!succ)
6262
{
6363
log.Complete();

src/ViewModels/CheckoutCommit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public override async Task<bool> Sure()
5252
{
5353
succ = await new Commands.Stash(_repo.FullPath)
5454
.Use(log)
55-
.PushAsync("CHECKOUT_AUTO_STASH");
55+
.PushAsync("CHECKOUT_AUTO_STASH", false);
5656
if (!succ)
5757
{
5858
log.Complete();

src/ViewModels/CreateBranch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public override async Task<bool> Sure()
136136
{
137137
succ = await new Commands.Stash(_repo.FullPath)
138138
.Use(log)
139-
.PushAsync("CREATE_BRANCH_AUTO_STASH");
139+
.PushAsync("CREATE_BRANCH_AUTO_STASH", false);
140140
if (!succ)
141141
{
142142
log.Complete();

src/ViewModels/Pull.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public override async Task<bool> Sure()
117117
}
118118
else
119119
{
120-
var succ = await new Commands.Stash(_repo.FullPath).Use(log).PushAsync("PULL_AUTO_STASH");
120+
var succ = await new Commands.Stash(_repo.FullPath).Use(log).PushAsync("PULL_AUTO_STASH", false);
121121
if (!succ)
122122
{
123123
log.Complete();

0 commit comments

Comments
 (0)