fixup! feat: implement autorebase for PRs with multiple commits

lundibundi · lundibundi · commit 56a91f6fba66 · 2020-08-17T12:54:41.000+03:00
diff --git a/lib/landing_session.js b/lib/landing_session.js
@@ -177,10 +177,12 @@ class LandingSession extends Session {
       const assumeYes = this.cli.assumeYes ? '--yes' : '';
       const msgAmend = `-x "git node land --amend ${assumeYes}"`;
       try {
-        await runAsync('git',
+        await forceRunAsync('git',
           ['rebase', `${upstream}/${branch}`, '-i', '--autosquash', msgAmend],
           {
+            ignoreFailure: false,
             spawnArgs: {
+              shell: true,
               env: { ...process.env, GIT_SEQUENCE_EDITOR: ':' }
             }
           });

Original file line number	Diff line number	Diff line change
`@@ -177,10 +177,12 @@ class LandingSession extends Session {`
`177`	`177`	`const assumeYes = this.cli.assumeYes ? '--yes' : '';`
`178`	`178`	const msgAmend = `-x "git node land --amend ${assumeYes}"`;
`179`	`179`	`try {`
`180`		`- await runAsync('git',`
	`180`	`+ await forceRunAsync('git',`
`181`	`181`	['rebase', `${upstream}/${branch}`, '-i', '--autosquash', msgAmend],
`182`	`182`	`{`
	`183`	`+ ignoreFailure: false,`
`183`	`184`	`spawnArgs: {`
	`185`	`+ shell: true,`
`184`	`186`	`env: { ...process.env, GIT_SEQUENCE_EDITOR: ':' }`
`185`	`187`	`}`
`186`	`188`	`});`