Commitff789c4

committed

log cherry-pick warnings

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent3dbbd46 commitff789c4Copy full SHA for ff789c4

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,18 @@ export function createCherryPick(cwd: string) {`
`22`	`22`	`returnasyncfunctioncherryPick(commits:string[]):Promise<void>{`
`23`	`23`	`for(constcommitofcommits){`
`24`	`24`	`try{`
`25`		`-const{ stdout}=awaitcreateExec(cwd)(`
	`25`	`+const{ stdout, stderr}=awaitcreateExec(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}=awaitcreateExec(cwdDir)(command);`
`52`	`56`
	`57`	`+console.log(stdout);`
`53`	`58`	`console.warn(stderr);`
`54`	`59`	`}catch(e){`
`55`	`60`	console.error(`Command failed: "${command}"`);

Comments

(0)