File tree 1 file changed +6
-1
lines changed
1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -22,14 +22,18 @@ export function createCherryPick(cwd: string) {
22
22
return async function cherryPick ( commits : string [ ] ) : Promise < void > {
23
23
for ( const commit of commits ) {
24
24
try {
25
- const { stdout } = await createExec ( cwd ) (
25
+ const { stdout, stderr } = await createExec ( cwd ) (
26
26
`git cherry-pick -X theirs ${ commit } `
27
27
) ;
28
+ if ( stderr ) {
29
+ console . warn ( stderr ) ;
30
+ }
28
31
if ( ! stdout ) {
29
32
console . warn ( `No cherry-pick output for ${ commit } ` ) ;
30
33
}
31
34
} catch ( e ) {
32
35
console . warn ( `Cherry-pick failed for ${ commit } ` ) ;
36
+ console . error ( e . message ) ;
33
37
}
34
38
}
35
39
} ;
@@ -50,6 +54,7 @@ export function createCommandRunner(cwd: string) {
50
54
}
51
55
const { stdout, stderr } = await createExec ( cwdDir ) ( command ) ;
52
56
57
+ console . log ( stdout ) ;
53
58
console . warn ( stderr ) ;
54
59
} catch ( e ) {
55
60
console . error ( `Command failed: "${ command } "` ) ;
You can’t perform that action at this time.
0 commit comments