From 6705daadc281401eb5cf22fa234709b20e09df9d Mon Sep 17 00:00:00 2001 From: Denys Otrishko Date: Sat, 15 Aug 2020 12:45:41 +0300 Subject: [PATCH] fixup! feat: implement autorebase for PRs with multiple commits --- lib/landing_session.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/landing_session.js b/lib/landing_session.js index 7f51525c..425c3cd0 100644 --- 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: ':' } } });