Skip to content

Commit 96a41ca

Browse files
committed
fix: use stash pop to replace stash apply
1 parent 4c17a4b commit 96a41ca

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/popups/checkout_option.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ use crate::{
1414
use anyhow::{Ok, Result};
1515
use asyncgit::sync::branch::checkout_remote_branch;
1616
use asyncgit::sync::status::discard_status;
17-
use asyncgit::sync::RepoPath;
18-
use asyncgit::sync::{
19-
checkout_branch, stash_apply, stash_save, BranchInfo,
20-
};
17+
use asyncgit::sync::{checkout_branch, stash_save, BranchInfo};
18+
use asyncgit::sync::{stash_pop, RepoPath};
2119
use crossterm::event::Event;
2220
use ratatui::{
2321
layout::{Alignment, Rect},
@@ -149,7 +147,7 @@ impl CheckoutOptionPopup {
149147
false,
150148
)?;
151149
self.checkout()?;
152-
stash_apply(&self.repo, stash_id, false)?;
150+
stash_pop(&self.repo, stash_id)?;
153151
}
154152
CheckoutOptions::Unchange => {
155153
self.checkout()?;

0 commit comments

Comments
 (0)