fixup! feat: implement autorebase for PRs with multiple commits

nodejs · Aug 15, 2020 · 6705daa · 6705daa
1 parent 12b8410
commit 6705daa
Showing 1 changed file with 3 additions and 1 deletion.
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: ':' }
             }
           });