@@ -15,8 +15,9 @@ use crate::{
15
15
use anyhow:: { Ok , Result } ;
16
16
use asyncgit:: sync:: branch:: checkout_remote_branch;
17
17
use asyncgit:: sync:: status:: discard_status;
18
- use asyncgit:: sync:: { checkout_branch, stash_save, BranchInfo } ;
19
- use asyncgit:: sync:: { stash_pop, RepoPath } ;
18
+ use asyncgit:: sync:: {
19
+ checkout_branch, stash_pop, stash_save, BranchInfo , RepoPath ,
20
+ } ;
20
21
use crossterm:: event:: Event ;
21
22
use ratatui:: {
22
23
layout:: { Alignment , Rect } ,
@@ -65,7 +66,8 @@ impl CheckoutOptionPopup {
65
66
) ,
66
67
] ) ) ;
67
68
68
- let ( kind_name, kind_desc) = checkout_option_to_string ( self . option ) ;
69
+ let ( kind_name, kind_desc) =
70
+ checkout_option_to_string ( self . option ) ;
69
71
70
72
txt. push ( Line :: from ( vec ! [
71
73
Span :: styled(
@@ -112,12 +114,8 @@ impl CheckoutOptionPopup {
112
114
fn handle_event ( & mut self ) -> Result < ( ) > {
113
115
match self . option {
114
116
CheckoutOptions :: StashAndReapply => {
115
- let stash_id = stash_save (
116
- & self . repo ,
117
- Some ( "Checkout auto stash" ) ,
118
- true ,
119
- false ,
120
- ) ?;
117
+ let stash_id =
118
+ stash_save ( & self . repo , None , true , false ) ?;
121
119
self . checkout ( ) ?;
122
120
stash_pop ( & self . repo , stash_id) ?;
123
121
}
0 commit comments