@@ -15,8 +15,9 @@ use crate::{
1515use anyhow:: { Ok , Result } ;
1616use asyncgit:: sync:: branch:: checkout_remote_branch;
1717use 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+ } ;
2021use crossterm:: event:: Event ;
2122use ratatui:: {
2223 layout:: { Alignment , Rect } ,
@@ -65,7 +66,8 @@ impl CheckoutOptionPopup {
6566 ) ,
6667 ] ) ) ;
6768
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 ) ;
6971
7072 txt. push ( Line :: from ( vec ! [
7173 Span :: styled(
@@ -112,12 +114,8 @@ impl CheckoutOptionPopup {
112114 fn handle_event ( & mut self ) -> Result < ( ) > {
113115 match self . option {
114116 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 ) ?;
121119 self . checkout ( ) ?;
122120 stash_pop ( & self . repo , stash_id) ?;
123121 }
0 commit comments