switch to --oneCommitMax

components/git/land.js

@@ -47,8 +47,9 @@ const landActions = {
     default: false,
     type: 'boolean'
   },
-  allowMultipleCommits: {
-    describe: 'Switch default answer if the pull request more than one commit',
+  oneCommitMax: {
+    describe: 'When run in conjunction with the --yes option, will abort the ' +
+      'session if trying to land more than one commit',
     default: false,
     type: 'boolean'
   }

lib/landing_session.js

@@ -24,15 +24,15 @@ const LINT_RESULTS = {
 class LandingSession extends Session {
   constructor(cli, req, dir, {
     prid, backport, lint, autorebase, fixupAll,
-    checkCI, allowMultipleCommits
+    checkCI, oneCommitMax,
   } = {}) {
     super(cli, dir, prid);
     this.req = req;
     this.backport = backport;
     this.lint = lint;
     this.autorebase = autorebase;
     this.fixupAll = fixupAll;
-    this.allowMultipleCommits = allowMultipleCommits;
+    this.oneCommitMax = oneCommitMax;
     this.expectedCommitShas = [];
     this.checkCI = !!checkCI;
   }
@@ -43,7 +43,7 @@ class LandingSession extends Session {
     args.lint = this.lint;
     args.autorebase = this.autorebase;
     args.fixupAll = this.fixupAll;
-    args.allowMultipleCommits = this.allowMultipleCommits;
+    args.oneCommitMax = this.oneCommitMax;
     return args;
   }
 
@@ -354,7 +354,7 @@ class LandingSession extends Session {
 
   async final() {
     const {
-      cli, owner, repo, upstream, branch, prid, allowMultipleCommits
+      cli, owner, repo, upstream, branch, prid, oneCommitMax
     } = this;
 
     // Check that git rebase/am has been completed.
@@ -370,7 +370,7 @@ class LandingSession extends Session {
       const forceLand = await cli.prompt(
         'There are more than one commit in the PR. ' +
         'Do you still want to land it?',
-        { defaultAnswer: allowMultipleCommits });
+        { defaultAnswer: !oneCommitMax });
 
       if (!forceLand) {
         cli.info(