Skip to content

Commit ff789c4

Browse files
committed
log cherry-pick warnings
Signed-off-by: shmck <[email protected]>
1 parent 3dbbd46 commit ff789c4

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Diff for: src/utils/exec.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@ export function createCherryPick(cwd: string) {
2222
return async function cherryPick(commits: string[]): Promise<void> {
2323
for (const commit of commits) {
2424
try {
25-
const { stdout } = await createExec(cwd)(
25+
const { stdout, stderr } = await createExec(cwd)(
2626
`git cherry-pick -X theirs ${commit}`
2727
);
28+
if (stderr) {
29+
console.warn(stderr);
30+
}
2831
if (!stdout) {
2932
console.warn(`No cherry-pick output for ${commit}`);
3033
}
3134
} catch (e) {
3235
console.warn(`Cherry-pick failed for ${commit}`);
36+
console.error(e.message);
3337
}
3438
}
3539
};
@@ -50,6 +54,7 @@ export function createCommandRunner(cwd: string) {
5054
}
5155
const { stdout, stderr } = await createExec(cwdDir)(command);
5256

57+
console.log(stdout);
5358
console.warn(stderr);
5459
} catch (e) {
5560
console.error(`Command failed: "${command}"`);

0 commit comments

Comments
 (0)