diff --git a/lib/landing_session.js b/lib/landing_session.js index 718b5c3a..601640ec 100644 --- a/lib/landing_session.js +++ b/lib/landing_session.js @@ -67,7 +67,7 @@ class LandingSession extends Session { cli.separator(); // TODO: check that patches downloaded match metadata.commits try { - await forceRunAsync('git', ['am', '--whitespace=fix', this.patchPath], { + await forceRunAsync('git', ['am', this.patchPath], { ignoreFailure: false }); } catch (ex) { @@ -78,7 +78,6 @@ class LandingSession extends Session { await runAsync('git', [ 'am', '-3', - '--whitespace=fix', this.patchPath ]); } else {