File tree Expand file tree Collapse file tree 1 file changed +2
-4
lines changed Expand file tree Collapse file tree 1 file changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -80,9 +80,8 @@ pub fn cherry_pick(
80
80
81
81
let mut tip_id = head_id;
82
82
while let Some ( op) = rebase. next ( ) {
83
- op. map_err ( |e | {
83
+ op. inspect_err ( |_err | {
84
84
let _ = rebase. abort ( ) ;
85
- e
86
85
} ) ?;
87
86
let inmemory_index = rebase. inmemory_index ( ) . unwrap ( ) ;
88
87
if inmemory_index. has_conflicts ( ) {
@@ -122,9 +121,8 @@ pub fn cherry_pick(
122
121
// For simple rebases, preserve the original commit time
123
122
sig = git2:: Signature :: new ( name, email, & cherry_commit. time ( ) ) ?. to_owned ( ) ;
124
123
}
125
- let commit_id = rebase. commit ( None , & sig, None ) . map_err ( |e | {
124
+ let commit_id = rebase. commit ( None , & sig, None ) . inspect_err ( |_err | {
126
125
let _ = rebase. abort ( ) ;
127
- e
128
126
} ) ;
129
127
let commit_id = match commit_id {
130
128
Ok ( commit_id) => Ok ( commit_id) ,
You can’t perform that action at this time.
0 commit comments